From 6d77540b23d2a1cb47fa5a861ceb9a3610d93da9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A1bor=20Hojtsy?= <gabor@hojtsy.hu>
Date: Sun, 16 Dec 2007 18:25:22 +0000
Subject: #199428 by Lynn: default to the primary links for content menu items
 (usability)

---
 modules/menu/menu.admin.inc | 2 +-
 modules/menu/menu.module    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'modules')

diff --git a/modules/menu/menu.admin.inc b/modules/menu/menu.admin.inc
index 8deb81ee6..021bd4bd0 100644
--- a/modules/menu/menu.admin.inc
+++ b/modules/menu/menu.admin.inc
@@ -605,7 +605,7 @@ function menu_configure() {
   $menu_options = menu_get_menus();
   $form['menu_default_node_menu'] = array('#type' => 'select',
     '#title' => t('Default menu for content'),
-    '#default_value' => variable_get('menu_default_node_menu', 'navigation'),
+    '#default_value' => variable_get('menu_default_node_menu', 'primary-links'),
     '#options' => $menu_options,
     '#description' => t('Choose the menu to be the default in the menu options in the content authoring form.'),
   );
diff --git a/modules/menu/menu.module b/modules/menu/menu.module
index 92eef24e8..8b5cf83f5 100644
--- a/modules/menu/menu.module
+++ b/modules/menu/menu.module
@@ -319,7 +319,7 @@ function menu_nodeapi(&$node, $op) {
     case 'prepare':
       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_default_node_menu', 'primary-links');
         $item = array();
         if (isset($node->nid)) {
           // Give priority to the default menu
@@ -396,7 +396,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 = 'navigation:0';
+      $default = 'primary-links:0';
     }
     $form['menu']['parent'] = array(
       '#type' => 'select',
-- 
cgit v1.2.3