? docs
? tmp
? modules/syndication
? sites/all/modules/admin_menu
? sites/all/modules/cck
? sites/all/modules/coder
? sites/all/modules/cvs_deploy
? sites/all/modules/demo
? sites/all/modules/devel
? sites/all/modules/drush
? sites/all/modules/google_analytics
? sites/all/modules/path_redirect
? sites/all/modules/pbs
? sites/all/modules/plugin_manager
? sites/all/modules/robotstxt
? sites/all/modules/sandbox
Index: modules/node/node.pages.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.pages.inc,v
retrieving revision 1.57
diff -u -p -r1.57 node.pages.inc
--- modules/node/node.pages.inc	14 Mar 2009 23:01:36 -0000	1.57
+++ modules/node/node.pages.inc	18 Mar 2009 04:49:05 -0000
@@ -13,7 +13,17 @@
 function node_page_edit($node) {
   $type_name = node_get_types('name', $node);
   drupal_set_title(t('<em>Edit @type</em> @title', array('@type' => $type_name, '@title' => $node->title)), PASS_THROUGH);
-  return drupal_get_form($node->type . '_node_form', $node);
+
+  if (!$type_name) {
+    drupal_set_message(t('The content type @type has been disabled or removed. You can no longer edit this content until the content type is re-enabled or re-created.', array('@type' => $node->type)), 'error');
+    if (user_access('administer content types')) {
+      $page['check_content']['#markup'] = l(t('View content types.'), 'admin/build/types');
+    }
+    return drupal_get_page($page);
+  }
+  else {
+    return drupal_get_form($node->type . '_node_form', $node);
+  }
 }
 
 function node_add_page() {