From 124f83e79c6da47c6434f794335baf86bd21aa3c Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Tue, 23 Feb 2010 10:32:10 +0000
Subject: [PATCH] - Patch #716792 by bleen18, agentrickard: remove 'Default
 menu for content' left-over setting.

---
 modules/menu/menu.admin.inc | 7 -------
 modules/menu/menu.module    | 2 +-
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/modules/menu/menu.admin.inc b/modules/menu/menu.admin.inc
index 3f739ba94e1..c73af82a4c1 100644
--- a/modules/menu/menu.admin.inc
+++ b/modules/menu/menu.admin.inc
@@ -656,13 +656,6 @@ function menu_configure() {
   );
 
   $menu_options = menu_get_menus();
-  $form['menu_default_node_menu'] = array(
-    '#type' => 'select',
-    '#title' => t('Default menu for content'),
-    '#default_value' => 'navigation',
-    '#options' => $menu_options,
-    '#description' => t('Choose the menu to be the default in the menu options in the content authoring form.'),
-  );
 
   $main = variable_get('menu_main_links_source', 'main-menu');
   $main_options = array_merge($menu_options, array('' => t('No Main links')));
diff --git a/modules/menu/menu.module b/modules/menu/menu.module
index 01477fafe33..93a124245a6 100644
--- a/modules/menu/menu.module
+++ b/modules/menu/menu.module
@@ -541,7 +541,7 @@ function menu_node_delete($node) {
 function menu_node_prepare($node) {
   if (empty($node->menu)) {
     // Prepare the node for the edit form so that $node->menu always exists.
-    $menu_name = variable_get('menu_default_node_menu', 'navigation');
+    $menu_name = variable_get('menu_parent_' . $node->type, 'main-menu:0');
     $item = array();
     if (isset($node->nid)) {
       // Give priority to the default menu