Use array_merge instead of array_replace (same effect, and array_merge works with...

fixes http://status.net/open-source/issues/3393

diff --git a/lib/siteprofile.php b/lib/siteprofile.php
index 51ce907b1927d039bd4178e219768d4b49b5c59b..b5c6fc304cbe827538a5aa01d95ee492d01cf669 100644 (file)
--- a/lib/siteprofile.php
+++ b/lib/siteprofile.php
@@ -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,

diff --git a/lib/statusnet.php b/lib/statusnet.php
index e4fb60ec7c6e41f02967d4d8bafbdedab10beb31..bffa62577348338266a52ead61e4ca66a82c0af6 100644 (file)
--- a/lib/statusnet.php
+++ b/lib/statusnet.php
@@ -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)