Merge pull request #465 from droptica/develop

Fixed RC1 for drupal.org
droptica · Apr 21, 2020 · a87fadb · a87fadb
2 parents b92ba30 + 52e054b
commit a87fadb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/drupal-org.make b/drupal-org.make
@@ -19,6 +19,7 @@ projects[geysir][version] = 1
 projects[google_analytics][version] = 2
 projects[google_tag][version] = 1
 projects[lazy][version] = 3
+projects[lazy][patch][] = https://www.drupal.org/files/issues/2020-04-17/lazy_droopler.patch
 projects[link_attributes][version] = 1
 projects[linkit][version] = 4
 projects[metatag][version] = 1

diff --git a/modules/custom/d_update/src/Updater.php b/modules/custom/d_update/src/Updater.php
@@ -418,6 +418,9 @@ public function updateConfigurations($source, $name) {
       if (isset($updates['add'])) {
         $newConfig = NestedArray::mergeDeep($newConfig, $updates['add']);
       }
+      if (!isset($updates['change']['expected'])) {
+        $updates['change']['expected'] = NULL;
+      }
       if (!$this->modifyConfig($configName, $newConfig, $updates['change']['expected'])) {
         $status[] = FALSE;
         $this->getLogger('d_update')