summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
authorAngie Byron <webchick@24967.no-reply.drupal.org>2010-10-07 00:28:20 +0000
committerAngie Byron <webchick@24967.no-reply.drupal.org>2010-10-07 00:28:20 +0000
commit65b99dc85fde083cca0938634bb15c4e1779c50d (patch)
treee6313de07afaf6962b0cfe4f0c637a3845e6d06b /includes
parent466c8ff543ec24e224d1c03a856d6e89459e4243 (diff)
downloadbrdo-65b99dc85fde083cca0938634bb15c4e1779c50d.tar.gz
brdo-65b99dc85fde083cca0938634bb15c4e1779c50d.tar.bz2
#895014 by Damien Tournoud, chx, catch: Fixed all fields of a node type are lost on module disable.
Diffstat (limited to 'includes')
-rw-r--r--includes/common.inc4
1 files changed, 3 insertions, 1 deletions
diff --git a/includes/common.inc b/includes/common.inc
index 7195e985e..1123b1c9a 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -6727,8 +6727,10 @@ function drupal_flush_all_caches() {
system_rebuild_theme_data();
drupal_theme_rebuild();
- menu_rebuild();
node_types_rebuild();
+ // node_menu() defines menu items based on node types so it needs to come
+ // after node types are rebuilt.
+ menu_rebuild();
// Synchronize to catch any actions that were added or removed.
actions_synchronize();