Commit 58d13007 authored by Florian Hülsmann's avatar Florian Hülsmann

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

parent 53d54eb9
......@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment