diff core/lib/Drupal/Core/Config/Config.php @ 16:c2387f117808

Routine composer update
author Chris Cannam
date Tue, 10 Jul 2018 15:07:59 +0100
parents 1fec387a4317
children
line wrap: on
line diff
--- a/core/lib/Drupal/Core/Config/Config.php	Thu Apr 26 11:26:54 2018 +0100
+++ b/core/lib/Drupal/Core/Config/Config.php	Tue Jul 10 15:07:59 2018 +0100
@@ -219,6 +219,10 @@
       }
     }
 
+    // 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 @@
     $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;
   }