7.x-1.8 Release Candidate 1

profiles/wcm_base/CHANGELOG.txt

+WCM Base 7.x-1.8-rc1, 2018-05-31
+--------------------------------
+- WCM Base: Added patch to rebuild Menu Block IDs on cache clear.
+
 WCM Base 7.x-1.7, 2018-05-30
 ----------------------------
 - WCM Base: Patched Menu Block module to allow custom delta values.

profiles/wcm_base/modules/contrib/menu_block/PATCHES.txt

 The following patches have been applied to this project:
 - http://drupal.org/files/issues/2018-05-14/menu_block-customize_deltas-2076119-7.patch
+- http://drupal.org/files/issues/2018-06-01/menu_block-rebuild-block-ids-2932156-5.patch
 
 This file was automatically generated by Drush Make (http://drupal.org/project/drush).

profiles/wcm_base/modules/contrib/menu_block/menu_block.module

@@ -1070,3 +1070,44 @@ function menu_block_menu_link_update($link) {
 function menu_block_menu_link_delete($link) {
   menu_block_menu_link_insert($link);
 }
+
+/**
+ * Implements hook_flush_caches().
+ *
+ * Tell Drupal to execute callback that rebuilds menu_block_ids variable.
+ */
+function menu_block_flush_caches() {
+  register_shutdown_function('menu_block_rebuild_block_ids');
+  return array();
+}
+
+/**
+ * Rebuild menu_block_ids from existing menu_block delta values in block table.
+ */
+function menu_block_rebuild_block_ids() {
+  $existing = variable_get('menu_block_ids', array());
+  //  exclude non-numeric delta values (eg menu blocks exported into Features modules)
+  $new = array();
+  $result = db_query('select distinct delta from block where module = :module and delta is not null', array(':module' => 'menu_block'));
+  if ($result) {
+    foreach ($result as $row) {
+      $id = $row->delta;
+      if ($id) {
+        $new[] = $id;
+      }
+    }
+  }
+  sort($new);
+  if ($new != $existing) {
+    $missing = array_diff($existing, $new);
+    if ($missing) {
+      watchdog('menu_block', 'Removing obsolete block IDs from menu_block_ids variable: !list', array('!list' => implode(',', $missing)));
+    }
+    $additions = array_diff($new, $existing);
+    if ($additions) {
+      watchdog('menu_block', 'Adding missing block IDs to menu_block_ids variable: !list', array('!list' => implode(',', $additions)));
+    }
+    variable_set('menu_block_ids', $new);
+  }
+}
+

profiles/wcm_base/wcm_base.make

@@ -82,6 +82,7 @@ projects[mailsystem][subdir] = contrib
 projects[menu_block][version] = 2.7
 projects[menu_block][subdir] = contrib
 projects[menu_block][patch][2076119] = http://drupal.org/files/issues/2018-05-14/menu_block-customize_deltas-2076119-7.patch
+projects[menu_block][patch][2932156] = http://drupal.org/files/issues/2018-06-01/menu_block-rebuild-block-ids-2932156-5.patch
 
 projects[migrate][version] = 2.8
 projects[migrate][subdir] = contrib