X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs-website;a=blobdiff_plain;f=web%2Fcore%2Flib%2FDrupal%2FCore%2FConfig%2FConfig.php;fp=web%2Fcore%2Flib%2FDrupal%2FCore%2FConfig%2FConfig.php;h=f7e0ede695d15db0ff0c1252653e6f93a78a4bca;hp=7299d5e642cdc5afe6a0cf8df90b81886ccd44d5;hb=0bf8d09d2542548982e81a441b1f16e75873a04f;hpb=74df008bdbb3a11eeea356744f39b802369bda3c

diff --git a/web/core/lib/Drupal/Core/Config/Config.php b/web/core/lib/Drupal/Core/Config/Config.php
index 7299d5e64..f7e0ede69 100644
--- a/web/core/lib/Drupal/Core/Config/Config.php
+++ b/web/core/lib/Drupal/Core/Config/Config.php
@@ -219,6 +219,10 @@ class Config extends StorableConfigBase {
       }
     }
 
+    // Potentially configuration schema could have changed the underlying data's
+    // types.
+    $this->resetOverriddenData();
+
     $this->storage->write($this->name, $this->data);
     if (!$this->isNew) {
       Cache::invalidateTags($this->getCacheTags());
@@ -226,9 +230,6 @@ class Config extends StorableConfigBase {
     $this->isNew = FALSE;
     $this->eventDispatcher->dispatch(ConfigEvents::SAVE, new ConfigCrudEvent($this));
     $this->originalData = $this->data;
-    // Potentially configuration schema could have changed the underlying data's
-    // types.
-    $this->resetOverriddenData();
     return $this;
   }