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

2014-03-31 12:36:55 +02:00
parent 758ac0bdc5 58d1300745
commit 710b7f61a2
1 changed files with 1 additions and 1 deletions
--- 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)