diff options
| author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2009-09-10 22:10:10 +0000 |
|---|---|---|
| committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2009-09-10 22:10:10 +0000 |
| commit | 0d8adb439d47d2f30fc0d4edee029f40d3145316 (patch) | |
| tree | c2884b6856f719ebcd697af0590ac4af4be6f00e | |
| parent | e2d58353bcf9cc438f61066fa8176df957904bd6 (diff) | |
| download | brdo-0d8adb439d47d2f30fc0d4edee029f40d3145316.tar.gz brdo-0d8adb439d47d2f30fc0d4edee029f40d3145316.tar.bz2 | |
#306316 follow-up by catch: Revert coupling of node_types_rebuild() and menu_rebuild().
| -rw-r--r-- | includes/common.inc | 2 | ||||
| -rw-r--r-- | modules/node/content_types.inc | 2 | ||||
| -rw-r--r-- | modules/node/node.module | 2 | ||||
| -rw-r--r-- | modules/system/system.admin.inc | 1 |
4 files changed, 4 insertions, 3 deletions
diff --git a/includes/common.inc b/includes/common.inc index 781e27a9c..ff0acc58f 100644 --- a/includes/common.inc +++ b/includes/common.inc @@ -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. diff --git a/modules/node/content_types.inc b/modules/node/content_types.inc index 223609041..8a5adaf93 100644 --- a/modules/node/content_types.inc +++ b/modules/node/content_types.inc @@ -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; diff --git a/modules/node/node.module b/modules/node/node.module index 62c11ce83..a9128ff88 100644 --- a/modules/node/node.module +++ b/modules/node/node.module @@ -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(); } /** diff --git a/modules/system/system.admin.inc b/modules/system/system.admin.inc index 2d1875e74..bd7f54eff 100644 --- a/modules/system/system.admin.inc +++ b/modules/system/system.admin.inc @@ -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(); |