Security update for Core, with self-updated composer

[yaffs-website] / web / core / modules / search / src / Plugin / ConfigurableSearchPluginBase.php

diff --git a/web/core/modules/search/src/Plugin/ConfigurableSearchPluginBase.php b/web/core/modules/search/src/Plugin/ConfigurableSearchPluginBase.php
index 50a44dbf3b7d9fb4c854a24c6f9185ea957e3a20..7ad95f16823b27b99dd1a8bcc16c3918c3cffd62 100644 (file)
--- a/web/core/modules/search/src/Plugin/ConfigurableSearchPluginBase.php
+++ b/web/core/modules/search/src/Plugin/ConfigurableSearchPluginBase.php
@@ -23,7 +23,7 @@ abstract class ConfigurableSearchPluginBase extends SearchPluginBase implements
   public function __construct(array $configuration, $plugin_id, $plugin_definition) {
     parent::__construct($configuration, $plugin_id, $plugin_definition);
 
-    $this->configuration = NestedArray::mergeDeep($this->defaultConfiguration(), $this->configuration);
+    $this->setConfiguration($configuration);
   }
 
   /**
@@ -44,7 +44,7 @@ abstract class ConfigurableSearchPluginBase extends SearchPluginBase implements
    * {@inheritdoc}
    */
   public function setConfiguration(array $configuration) {
-    $this->configuration = $configuration;
+    $this->configuration = NestedArray::mergeDeep($this->defaultConfiguration(), $configuration);
   }
 
   /**