summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
authorAngie Byron <webchick@24967.no-reply.drupal.org>2010-08-23 23:38:06 +0000
committerAngie Byron <webchick@24967.no-reply.drupal.org>2010-08-23 23:38:06 +0000
commitf375573849cd38a8c3860ce23bd92cdbc984fdda (patch)
tree376d3cf88048d0f54d550e24789bfb5895ea51c1 /includes
parentdd5725690302d1cad7efd59140a599f9bd6ebde7 (diff)
downloadbrdo-f375573849cd38a8c3860ce23bd92cdbc984fdda.tar.gz
brdo-f375573849cd38a8c3860ce23bd92cdbc984fdda.tar.bz2
#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.
Diffstat (limited to 'includes')
-rw-r--r--includes/menu.inc3
1 files changed, 1 insertions, 2 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;
}