Commit 710b7f61 authored by mmn's avatar mmn

Merge commit 'refs/merge-requests/12' of...

Merge commit 'refs/merge-requests/12' of git://gitorious.org/statusnet/gnu-social into merge-requests/12
parents 758ac0bd 58d13007
......@@ -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