eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Evan Prodromou 2011-09-22 16:31:26 -04:00
commit e3460d9b24
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/siteprofile.php
View File

@ -90,7 +90,7 @@ class PublicSite extends SiteProfileSettings
global $config; global $config;
return array( return array(
// We only want to change these values, not replace entire 'site' array // We only want to change these values, not replace entire 'site' array
'site' => array_replace( 'site' => array_merge(
$config['site'], array( $config['site'], array(
'inviteonly' => false, 'inviteonly' => false,
'private' => false, 'private' => false,
@ -137,7 +137,7 @@ class PrivateSite extends SiteProfileSettings
global $config; global $config;
return array( return array(
// We only want to change these values, not replace entire 'site' array // We only want to change these values, not replace entire 'site' array
'site' => array_replace( 'site' => array_merge(
$config['site'], array( $config['site'], array(
'inviteonly' => true, 'inviteonly' => true,
'private' => true, 'private' => true,
@ -200,7 +200,7 @@ class CommunitySite extends SiteProfileSettings
global $config; global $config;
return array( return array(
// We only want to change these values, not replace entire 'site' array // We only want to change these values, not replace entire 'site' array
'site' => array_replace( 'site' => array_merge(
$config['site'], array( $config['site'], array(
'private' => false, 'private' => false,
'closed' => false 'closed' => false
@ -245,7 +245,7 @@ class SingleuserSite extends SiteProfileSettings
return array( return array(
'singleuser' => array('enabled' => true), 'singleuser' => array('enabled' => true),
// We only want to change these values, not replace entire 'site' array // We only want to change these values, not replace entire 'site' array
'site' => array_replace( 'site' => array_merge(
$config['site'], array( $config['site'], array(
'private' => false, 'private' => false,
'closed' => true, 'closed' => true,

2
lib/statusnet.php
View File

@ -310,7 +310,7 @@ class StatusNet
{ {
global $config; global $config;
$settings = SiteProfile::getSettings($name); $settings = SiteProfile::getSettings($name);
$config = array_replace($config, $settings); $config = array_merge($config, $settings);
} }
protected function _sn_to_path($sn) protected function _sn_to_path($sn)