? menu.patch
? sites/default/files
? sites/default/private
? sites/default/settings.php
Index: modules/menu/menu.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/menu/menu.module,v
retrieving revision 1.229
diff -u -p -r1.229 menu.module
--- modules/menu/menu.module	7 Mar 2010 07:55:14 -0000	1.229
+++ modules/menu/menu.module	22 Apr 2010 22:48:40 -0000
@@ -639,9 +639,11 @@ function menu_form_alter(&$form, $form_s
     );
 
     $default = ($link['mlid'] ? $link['menu_name'] . ':' . $link['plid'] : variable_get('menu_parent_' . $type, 'main-menu:0'));
-    // @todo This will fail with the new selective menus per content type.
+
+    // If the item is in a menu that is not permitted for this content type, allow it to stay there.
     if (!isset($options[$default])) {
-      $default = 'navigation:0';
+      $all_options = menu_parent_options(menu_get_menus(), $link);
+      $options[$default] = $all_options[$default];
     }
     $form['menu']['link']['parent'] = array(
       '#type' => 'select',