Commit f3755738 authored by webchick's avatar webchick

#410646 by dman, David_Rothstein, and thousands of other people: Fixed...

#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.
parent dd572569
......@@ -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;
}
......
......@@ -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(
......
......@@ -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 -->
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment