diff options
| author | Dries Buytaert <dries@buytaert.net> | 2010-02-23 10:32:10 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2010-02-23 10:32:10 +0000 |
| commit | 124f83e79c6da47c6434f794335baf86bd21aa3c (patch) | |
| tree | cba61c3e104333b49afc99ee5a2b7c82cf190ad5 /modules/menu | |
| parent | 120063909aa8ea2173ae1faa0ce9859a65908742 (diff) | |
| download | brdo-124f83e79c6da47c6434f794335baf86bd21aa3c.tar.gz brdo-124f83e79c6da47c6434f794335baf86bd21aa3c.tar.bz2 | |
- Patch #716792 by bleen18, agentrickard: remove 'Default menu for content' left-over setting.
Diffstat (limited to 'modules/menu')
| -rw-r--r-- | modules/menu/menu.admin.inc | 7 | ||||
| -rw-r--r-- | modules/menu/menu.module | 2 |
2 files changed, 1 insertions, 8 deletions
diff --git a/modules/menu/menu.admin.inc b/modules/menu/menu.admin.inc index 3f739ba94..c73af82a4 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 01477fafe..93a124245 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 |