From f375573849cd38a8c3860ce23bd92cdbc984fdda Mon Sep 17 00:00:00 2001
From: Angie Byron <webchick@24967.no-reply.drupal.org>
Date: Mon, 23 Aug 2010 23:38:06 +0000
Subject: #410646 by dman, David_Rothstein, and thousands of other people:
 Fixed 'Secondary menu' exists but is no longer the default source for the
 secondary links.

---
 modules/menu/menu.install   | 1 -
 modules/system/page.tpl.php | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'modules')

diff --git a/modules/menu/menu.install b/modules/menu/menu.install
index 5517a1164..1938a754f 100644
--- a/modules/menu/menu.install
+++ b/modules/menu/menu.install
@@ -52,7 +52,6 @@ function menu_install() {
     'user-menu' => $t("The <em>User</em> menu contains links related to the user's account, as well as the 'Log out' link."),
     'management' => $t('The <em>Management</em> menu contains links for administrative tasks.'),
     'main-menu' => $t('The <em>Main</em> menu is used on many sites to show the major sections of the site, often in a top navigation bar.'),
-    'secondary-menu' => $t('The <em>Secondary</em> menu is used on many sites for legal notices and contact pages.'),
   );
   foreach ($system_menus as $menu_name => $title) {
     $menu = array(
diff --git a/modules/system/page.tpl.php b/modules/system/page.tpl.php
index 2ddc75ac4..94cd24f3d 100644
--- a/modules/system/page.tpl.php
+++ b/modules/system/page.tpl.php
@@ -102,9 +102,10 @@
 
     </div></div> <!-- /.section, /#header -->
 
-    <?php if ($main_menu): ?>
+    <?php if ($main_menu || $secondary_menu): ?>
       <div id="navigation"><div class="section">
         <?php print theme('links__system_main_menu', array('links' => $main_menu, 'attributes' => array('id' => 'main-menu', 'class' => array('links', 'clearfix')), 'heading' => t('Main menu'))); ?>
+        <?php print theme('links__system_secondary_menu', array('links' => $secondary_menu, 'attributes' => array('id' => 'secondary-menu', 'class' => array('links', 'clearfix')), 'heading' => t('Secondary menu'))); ?>
       </div></div> <!-- /.section, /#navigation -->
     <?php endif; ?>
 
@@ -144,7 +145,6 @@
     </div></div> <!-- /#main, /#main-wrapper -->
 
     <div id="footer"><div class="section">
-      <?php print theme('links__system_secondary_menu', array('links' => $secondary_menu, 'attributes' => array('id' => 'secondary-menu', 'class' => array('links', 'clearfix')), 'heading' => t('Secondary menu'))); ?>
       <?php print render($page['footer']); ?>
     </div></div> <!-- /.section, /#footer -->
 
-- 
cgit v1.2.3