wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge commit 'refs/merge-requests/12' of git://gitorious.org/statusnet/gnu-social into merge-requests/12

Browse Source
This commit is contained in:
Mikael Nordfeldth 2014-03-31 12:36:55 +02:00
commit 710b7f61a2
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)