Merge commit 'refs/merge-requests/12' of git://gitorious.org/statusnet/gnu-social...

diff --git a/lib/statusnet.php b/lib/statusnet.php
index 9041a556cc3912fee47fb97b39212e1a9672c11a..5c2c3d5fdc58553891ccba03374bbf7d6869a0e2 100644 (file)
--- a/lib/statusnet.php
+++ b/lib/statusnet.php
@@ -329,7 +329,7 @@ class StatusNet
     {
         global $config;
         $settings = SiteProfile::getSettings($name);
-        $config = array_merge($config, $settings);
+        $config = array_replace_recursive($config, $settings);
     }
 
     protected static function _sn_to_path($sn)