? 515454b.patch
? sites/default/files
? sites/default/private
? sites/default/settings.php
Index: modules/node/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.module,v
retrieving revision 1.1157
diff -u -p -r1.1157 node.module
--- modules/node/node.module	1 Nov 2009 12:11:10 -0000	1.1157
+++ modules/node/node.module	1 Nov 2009 23:05:34 -0000
@@ -669,10 +669,12 @@ function _node_types_build() {
 
   $info_array = module_invoke_all('node_info');
   foreach ($info_array as $type => $info) {
+    // Add node types created by an implementation of hook_node_info() to $_node_types.
     $info['type'] = $type;
     $_node_types->types[$type] = node_type_set_defaults($info);
     $_node_types->names[$type] = $info['name'];
   }
+  // Query the node_type table in the database for all node types.
   $type_result = db_select('node_type', 'nt')
     ->addTag('translatable')
     ->addTag('node_type_access')
@@ -683,18 +685,15 @@ function _node_types_build() {
     // Check for node types from disabled modules and mark their types for removal.
     // Types defined by the node module in the database (rather than by a separate
     // module using hook_node_info) have a base value of 'node_content'. The isset()
-    // check prevents errors on old (pre-Drupal 7) databases.
+    // check prevents errors on old (pre-Drupal 7) databases. 
     if (isset($type_object->base) && $type_object->base != 'node_content' && empty($info_array[$type_object->type])) {
       $type_object->disabled = TRUE;
     }
     if (!isset($_node_types->types[$type_object->type]) || $type_object->modified) {
+      // If the node type was not created by an implementation of hook_node_info()
+      // then it won't be listed in $_node_types yet. Add it to $_node_types.
       $_node_types->types[$type_object->type] = $type_object;
       $_node_types->names[$type_object->type] = $type_object->name;
-
-      if ($type_object->type != $type_object->orig_type) {
-        unset($_node_types->types[$type_object->orig_type]);
-        unset($_node_types->names[$type_object->orig_type]);
-      }
     }
   }