]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
fixed config for php >=5; see php.net/array_merge
authorFlorian Hülsmann <fh@cbix.de>
Sun, 30 Mar 2014 14:56:48 +0000 (16:56 +0200)
committerFlorian Hülsmann <fh@cbix.de>
Sun, 30 Mar 2014 14:56:48 +0000 (16:56 +0200)
lib/statusnet.php

index 9041a556cc3912fee47fb97b39212e1a9672c11a..5c2c3d5fdc58553891ccba03374bbf7d6869a0e2 100644 (file)
@@ -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)