From 58d1300745c9778e47d2b5bc8f6ce0772fbe9553 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Florian=20H=C3=BClsmann?= Date: Sun, 30 Mar 2014 16:56:48 +0200 Subject: [PATCH] fixed config for php >=5; see php.net/array_merge --- lib/statusnet.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) -- 2.39.5