From: Florian Hülsmann <fh@cbix.de>
Date: Sun, 30 Mar 2014 14:56:48 +0000 (+0200)
Subject: fixed config for php >=5; see php.net/array_merge
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=58d1300745c9778e47d2b5bc8f6ce0772fbe9553;p=quix0rs-gnu-social.git

fixed config for php >=5; see php.net/array_merge
---

diff --git a/lib/statusnet.php b/lib/statusnet.php
index 9041a556cc..5c2c3d5fdc 100644
--- 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)