Merge pull request #19906 from MikeyMJCO/patch-8

Rebuild the Drupal route cache.
civicrm · Mar 26, 2021 · 93f40fc · 93f40fc
2 parents cc89c07 + a11c108
commit 93f40fc
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 0 deletions.
diff --git a/CRM/Core/Invoke.php b/CRM/Core/Invoke.php
@@ -394,6 +394,7 @@ public static function rebuildMenuAndCaches($triggerRebuild = FALSE, $sessionRes
       CRM_Utils_Request::retrieve('triggerRebuild', 'Boolean', CRM_Core_DAO::$_nullObject, FALSE, 0, 'GET')
     ) {
       CRM_Core_DAO::triggerRebuild();
+      $config->userSystem->invalidateRouteCache();
     }
     CRM_Core_DAO_AllCoreTables::reinitializeCache(TRUE);
     CRM_Core_ManagedEntities::singleton(TRUE)->reconcile();

diff --git a/CRM/Utils/System/Base.php b/CRM/Utils/System/Base.php
@@ -1012,4 +1012,10 @@ public function getCMSPermissionsUrlParams() {
     return [];
   }
 
+  /**
+   * Invalidates the cache of dynamic routes and forces a rebuild.
+   */
+  public function invalidateRouteCache() {
+  }
+
 }
diff --git a/CRM/Utils/System/Drupal8.php b/CRM/Utils/System/Drupal8.php
@@ -858,4 +858,14 @@ public function getUserObject($userID) {
     return \Drupal::entityTypeManager()->getStorage('user')->load($userID);
   }
 
+  /**
+   * Helper function to rebuild the Drupal 8 or 9 dynamic routing cache.
+   * We need to do this after enabling extensions that add routes and it's worth doing when we reset Civi paths.
+   */
+  public function invalidateRouteCache() {
+    if (class_exists('\Drupal') && \Drupal::hasContainer()) {
+      \Drupal::service('router.builder')->rebuild();
+    }
+  }
+
 }