We are no longer offering accounts on this server. Consider https://gitlab.freedesktop.org/ as a place to host projects.

Commit e3460d9b authored by Evan Prodromou's avatar Evan Prodromou

Merge branch 'master' of gitorious.org:statusnet/mainline

parents 8fa816c3 6f0cb0b2
......@@ -90,7 +90,7 @@ class PublicSite extends SiteProfileSettings
global $config;
return array(
// We only want to change these values, not replace entire 'site' array
'site' => array_replace(
'site' => array_merge(
$config['site'], array(
'inviteonly' => false,
'private' => false,
......@@ -137,7 +137,7 @@ class PrivateSite extends SiteProfileSettings
global $config;
return array(
// We only want to change these values, not replace entire 'site' array
'site' => array_replace(
'site' => array_merge(
$config['site'], array(
'inviteonly' => true,
'private' => true,
......@@ -200,7 +200,7 @@ class CommunitySite extends SiteProfileSettings
global $config;
return array(
// We only want to change these values, not replace entire 'site' array
'site' => array_replace(
'site' => array_merge(
$config['site'], array(
'private' => false,
'closed' => false
......@@ -245,7 +245,7 @@ class SingleuserSite extends SiteProfileSettings
return array(
'singleuser' => array('enabled' => true),
// We only want to change these values, not replace entire 'site' array
'site' => array_replace(
'site' => array_merge(
$config['site'], array(
'private' => false,
'closed' => true,
......
......@@ -310,7 +310,7 @@ class StatusNet
{
global $config;
$settings = SiteProfile::getSettings($name);
$config = array_replace($config, $settings);
$config = array_merge($config, $settings);
}
protected function _sn_to_path($sn)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment