? menu.module.patch
? node_types_rebuild.patch
? node_types_rebuild_2.patch
? sites/all/modules
? sites/default/files
? sites/default/settings.php
Index: includes/common.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/common.inc,v
retrieving revision 1.823
diff -u -p -r1.823 common.inc
--- includes/common.inc	10 Nov 2008 05:22:59 -0000	1.823
+++ includes/common.inc	11 Nov 2008 12:02:51 -0000
@@ -3793,7 +3793,7 @@ function drupal_flush_all_caches() {
   drupal_clear_js_cache();
   system_theme_data();
   drupal_theme_rebuild();
-  menu_rebuild();
+  // Rebuild content types, menu will be rebuilt as well.
   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.
Index: modules/node/content_types.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/content_types.inc,v
retrieving revision 1.59
diff -u -p -r1.59 content_types.inc
--- modules/node/content_types.inc	2 Nov 2008 10:48:31 -0000	1.59
+++ modules/node/content_types.inc	11 Nov 2008 12:02:51 -0000
@@ -315,7 +315,6 @@ function node_type_form_submit($form, &$
   }
 
   node_types_rebuild();
-  menu_rebuild();
   $t_args = array('%name' => $type->name);
 
   if ($op == t('Reset to defaults')) {
@@ -400,7 +399,6 @@ function node_type_delete_confirm_submit
   watchdog('menu', 'Deleted content type %name.', $t_args, WATCHDOG_NOTICE);
 
   node_types_rebuild();
-  menu_rebuild();
 
   $form_state['redirect'] = 'admin/build/types';
   return;
Index: modules/node/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.module,v
retrieving revision 1.995
diff -u -p -r1.995 node.module
--- modules/node/node.module	10 Nov 2008 05:19:46 -0000	1.995
+++ modules/node/node.module	11 Nov 2008 12:02:54 -0000
@@ -496,6 +496,8 @@ function node_types_rebuild() {
   }
 
   _node_types_build();
+  // This is required for proper menu items at node/add/type.
+  menu_rebuild();
 }
 
 /**
Index: modules/system/system.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.admin.inc,v
retrieving revision 1.103
diff -u -p -r1.103 system.admin.inc
--- modules/system/system.admin.inc	10 Nov 2008 05:23:00 -0000	1.103
+++ modules/system/system.admin.inc	11 Nov 2008 12:02:55 -0000
@@ -609,7 +609,6 @@ function system_modules($form_state = ar
   registry_rebuild();
   drupal_theme_rebuild();
   node_types_rebuild();
-  menu_rebuild();
   cache_clear_all('schema', 'cache');
   // Get current list of modules.
   $files = module_rebuild_cache();