Commit 0d8adb43 authored by webchick's avatar webchick

#306316 follow-up by catch: Revert coupling of node_types_rebuild() and menu_rebuild().

parent e2d58353
......@@ -5221,7 +5221,7 @@ function drupal_flush_all_caches() {
}
drupal_theme_rebuild();
// Rebuild content types, menu will be rebuilt as well.
menu_rebuild();
node_types_rebuild();
// Don't clear cache_form - in-progress form submissions may break.
// Ordered so clearing the page cache will always be the last action.
......
......@@ -350,6 +350,7 @@ function node_type_form_submit($form, &$form_state) {
}
node_types_rebuild();
menu_rebuild();
$t_args = array('%name' => $type->name);
if ($status == SAVED_UPDATED) {
......@@ -444,6 +445,7 @@ function node_type_delete_confirm_submit($form, &$form_state) {
watchdog('menu', 'Deleted content type %name.', $t_args, WATCHDOG_NOTICE);
node_types_rebuild();
menu_rebuild();
$form_state['redirect'] = 'admin/structure/types';
return;
......
......@@ -465,8 +465,6 @@ function node_types_rebuild() {
// Reset cached node type information so that the next access
// will use the updated data.
node_type_clear();
// This is required for proper menu items at node/add/type.
menu_rebuild();
}
/**
......
......@@ -1000,6 +1000,7 @@ function system_modules_submit($form, &$form_state) {
registry_rebuild();
drupal_theme_rebuild();
node_types_rebuild();
menu_rebuild();
cache_clear_all('schema', 'cache');
cache_clear_all('entity_info', 'cache');
drupal_clear_css_cache();
......
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