Security update for Core, with self-updated composer

[yaffs-website] / web / core / lib / Drupal / Core / Action / ConfigurableActionBase.php

diff --git a/web/core/lib/Drupal/Core/Action/ConfigurableActionBase.php b/web/core/lib/Drupal/Core/Action/ConfigurableActionBase.php
index cde7d5699cbd87b5e3397444efdd383f030f6d65..3d372fe646951bf0e011699289124d207a048d1b 100644 (file)
--- a/web/core/lib/Drupal/Core/Action/ConfigurableActionBase.php
+++ b/web/core/lib/Drupal/Core/Action/ConfigurableActionBase.php
@@ -17,7 +17,7 @@ abstract class ConfigurableActionBase extends ActionBase implements Configurable
   public function __construct(array $configuration, $plugin_id, $plugin_definition) {
     parent::__construct($configuration, $plugin_id, $plugin_definition);
 
-    $this->configuration += $this->defaultConfiguration();
+    $this->setConfiguration($configuration);
   }
 
   /**
@@ -38,7 +38,7 @@ abstract class ConfigurableActionBase extends ActionBase implements Configurable
    * {@inheritdoc}
    */
   public function setConfiguration(array $configuration) {
-    $this->configuration = $configuration;
+    $this->configuration = $configuration + $this->defaultConfiguration();
   }
 
   /**