X-Git-Url: http://aleph1.co.uk/gitweb/?a=blobdiff_plain;f=web%2Fcore%2Flib%2FDrupal%2FCore%2FAction%2FConfigurableActionBase.php;h=3d372fe646951bf0e011699289124d207a048d1b;hb=refs%2Fheads%2Fd864;hp=cde7d5699cbd87b5e3397444efdd383f030f6d65;hpb=a2bd1bf0c2c1f1a17d188f4dc0726a45494cefae;p=yaffs-website

diff --git a/web/core/lib/Drupal/Core/Action/ConfigurableActionBase.php b/web/core/lib/Drupal/Core/Action/ConfigurableActionBase.php
index cde7d5699..3d372fe64 100644
--- 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();
   }
 
   /**