diff options
| -rw-r--r-- | includes/menu.inc | 3 | ||||
| -rw-r--r-- | modules/menu/menu.install | 1 | ||||
| -rw-r--r-- | modules/system/page.tpl.php | 4 |
3 files changed, 3 insertions, 5 deletions
diff --git a/includes/menu.inc b/includes/menu.inc index 5eb8ff012..f94968943 100644 --- a/includes/menu.inc +++ b/includes/menu.inc @@ -1617,7 +1617,6 @@ function menu_list_system_menus() { 'management' => 'Management', 'user-menu' => 'User menu', 'main-menu' => 'Main menu', - 'secondary-menu' => 'Secondary menu', ); } @@ -2077,7 +2076,7 @@ function menu_set_active_menu_names($menu_names = NULL) { $active = $menu_names; } elseif (!isset($active)) { - $active = variable_get('menu_default_active_menus', array('management', 'navigation', 'user-menu', 'main-menu')); + $active = variable_get('menu_default_active_menus', array_keys(menu_list_system_menus())); } return $active; } 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 --> |