mirror_php/humhub
1
0
Fork 0
mirror of https://github.com/humhub/humhub.git synced 2025-03-04 07:08:58 +01:00
Code Issues Projects Releases Wiki Activity

Fixed #1457: DynamicConfig merge broken

Browse Source
This commit is contained in:
Lucas Bartholemy 2016-02-16 18:28:00 +01:00
parent 49d67283b9
commit 0c3765bcbd
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
protected/humhub/libs/DynamicConfig.php
View File

@ -28,8 +28,7 @@ class DynamicConfig extends \yii\base\Object
*/
public static function merge($new)
{
$config = self::load();
\yii\helpers\ArrayHelper::merge($new);
$config = \yii\helpers\ArrayHelper::merge(self::load(), $new);
self::save($config);
}