Commit 7139f025 authored by Crell's avatar Crell Committed by effulgentsia

Add a new-router rebuild step to the global flush operation.

parent c2e1a308
...@@ -6829,6 +6829,7 @@ function drupal_flush_all_caches() { ...@@ -6829,6 +6829,7 @@ function drupal_flush_all_caches() {
// Rebuild the menu router based on all rebuilt data. // Rebuild the menu router based on all rebuilt data.
// Important: This rebuild must happen last, so the menu router is guaranteed // Important: This rebuild must happen last, so the menu router is guaranteed
// to be based on up to date information. // to be based on up to date information.
router_rebuild();
menu_router_rebuild(); menu_router_rebuild();
// Re-initialize the maintenance theme, if the current request attempted to // Re-initialize the maintenance theme, if the current request attempted to
...@@ -6840,6 +6841,21 @@ function drupal_flush_all_caches() { ...@@ -6840,6 +6841,21 @@ function drupal_flush_all_caches() {
} }
} }
function router_rebuild() {
// We need to manually call each module so that we can know which module
// a given item came from.
$callbacks = array();
$dumper = drupal_container()->get('router.dumper');
foreach (module_implements('route_info') as $module) {
$routes = call_user_func($module . '_route_info');
drupal_alter('router_info', $routes);
$dumper->addRoutes($routes);
$dumper->dump(array('route_set' => $module));
}
}
/** /**
* Changes the dummy query string added to all CSS and JavaScript files. * Changes the dummy query string added to all CSS and JavaScript files.
* *
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment