Don't deep-merge plugin DB & config settings together

fixes #2561
craftcms · Mar 21, 2018 · 28c2659 · 28c2659
1 parent 6cffb4a
commit 28c2659
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/CHANGELOG-v3.md b/CHANGELOG-v3.md
@@ -28,6 +28,7 @@
 - `craft\web\View::renderString()` and `renderObjectTemplate()` no longer escape dynamically-output HTML in the template by default.
 - The `defineBehaviors` event on `craft\web\twig\variables\CraftVariable` is no longer deprecated.
 - Craft now requires Yii 2.0.15 or later.
+- Plugin settings defined in config files are no longer recursively merged with the database-stored settings. ([#2561](https://github.com/craftcms/cms/issues/2561))
 
 ### Fixed
 - Fixed a bug where database backups could fail on PostgreSQL if the database password contained special characters. ([#2568](https://github.com/craftcms/cms/issues/2568))

diff --git a/src/services/Plugins.php b/src/services/Plugins.php
@@ -742,7 +742,7 @@ public function createPlugin(string $handle, array $row = null)
         if ($row !== null) {
             $config['isInstalled'] = true;
 
-            $settings = ArrayHelper::merge(
+            $settings = array_merge(
                 $row['settings'] ?? [],
                 Craft::$app->getConfig()->getConfigFromFile($handle)
             );