eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Florian Hülsmann 2014-03-30 16:56:48 +02:00
parent 53d54eb929
commit 58d1300745
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/statusnet.php
View File

@ -329,7 +329,7 @@ class StatusNet
{ {
global $config; global $config;
$settings = SiteProfile::getSettings($name); $settings = SiteProfile::getSettings($name);
$config = array_merge($config, $settings); $config = array_replace_recursive($config, $settings);
} }
protected static function _sn_to_path($sn) protected static function _sn_to_path($sn)