diff options
| -rw-r--r-- | modules/menu/menu.admin.inc | 8 | ||||
| -rw-r--r-- | modules/menu/menu.module | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/modules/menu/menu.admin.inc b/modules/menu/menu.admin.inc index d0a7bc9d3..d9bb754b7 100644 --- a/modules/menu/menu.admin.inc +++ b/modules/menu/menu.admin.inc @@ -325,7 +325,7 @@ function menu_edit_item($form, &$form_state, $type, $item, $menu) { $options = menu_parent_options(menu_get_menus(), $item); $default = $item['menu_name'] . ':' . $item['plid']; if (!isset($options[$default])) { - $default = 'main-menu:0'; + $default = 'navigation:0'; } $form['menu']['parent'] = array( '#type' => 'select', @@ -687,17 +687,17 @@ function menu_configure() { $form['menu_default_node_menu'] = array( '#type' => 'select', '#title' => t('Default menu for content'), - '#default_value' => 'main-menu', + '#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', 'navigation'); $main_options = array_merge($menu_options, array('' => t('No Main links'))); $form['menu_main_links_source'] = array( '#type' => 'select', '#title' => t('Source for the Main links'), - '#default_value' => 'main-menu', + '#default_value' => 'navigation', '#options' => $main_options, '#tree' => FALSE, '#description' => t('Select what should be displayed as the Main links (typically at the top of the page).'), diff --git a/modules/menu/menu.module b/modules/menu/menu.module index 72025fb01..d338f877f 100644 --- a/modules/menu/menu.module +++ b/modules/menu/menu.module @@ -361,7 +361,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', 'main-menu'); + $menu_name = variable_get('menu_default_node_menu', 'navigation'); $item = array(); if (isset($node->nid)) { // Give priority to the default menu @@ -445,7 +445,7 @@ function menu_form_alter(&$form, $form_state, $form_id) { $options = menu_parent_options(menu_get_menus(), $item); $default = $item['menu_name'] . ':' . $item['plid']; if (!isset($options[$default])) { - $default = 'main-menu:0'; + $default = 'navigation:0'; } $form['menu']['parent'] = array( '#type' => 'select', |