Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

- Patch #716792 by bleen18, agentrickard: remove 'Default menu for content' left-over setting.

merge-requests/26/head
Dries Buytaert 2010-02-23 10:32:10 +00:00
parent 120063909a
commit 124f83e79c
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/menu/menu.admin.inc
View File

@ -656,13 +656,6 @@ function menu_configure() {
); );
$menu_options = menu_get_menus(); $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 = variable_get('menu_main_links_source', 'main-menu');
$main_options = array_merge($menu_options, array('' => t('No Main links'))); $main_options = array_merge($menu_options, array('' => t('No Main links')));

2
modules/menu/menu.module
View File

@ -541,7 +541,7 @@ function menu_node_delete($node) {
function menu_node_prepare($node) { function menu_node_prepare($node) {
if (empty($node->menu)) { if (empty($node->menu)) {
// Prepare the node for the edit form so that $node->menu always exists. // 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(); $item = array();
if (isset($node->nid)) { if (isset($node->nid)) {
// Give priority to the default menu // Give priority to the default menu