Fixed #1457: DynamicConfig merge broken

humhub · Feb 16, 2016 · 0c3765b · 0c3765b
1 parent 49d6728
commit 0c3765b
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/protected/humhub/libs/DynamicConfig.php b/protected/humhub/libs/DynamicConfig.php
@@ -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);
     }