Use array_merge instead of array_replace (same effect, and array_merge works with PHP versions < 5.3)

fixes http://status.net/open-source/issues/3393
2011-09-22 12:49:04 -07:00
parent f65fa42e15
commit 4c91dc4546
2 changed files with 5 additions and 5 deletions
--- a/lib/statusnet.php
+++ b/lib/statusnet.php
@@ -310,7 +310,7 @@ class StatusNet
    {
        global $config;
        $settings = SiteProfile::getSettings($name);
-        $config = array_replace($config, $settings);
+        $config = array_merge($config, $settings);
    }

    protected function _sn_to_path($sn)