From a730d23d1415a99ba568acdb896d5c2e51882ae4 Mon Sep 17 00:00:00 2001 From: Dries Buytaert Date: Sat, 23 Feb 2008 08:13:09 +0000 Subject: - Patch #216813 by pwolanin et al: fixed upgrade path for primary links and navigation. --- includes/menu.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'includes/menu.inc') diff --git a/includes/menu.inc b/includes/menu.inc index 811dfd253..b856176df 100644 --- a/includes/menu.inc +++ b/includes/menu.inc @@ -1173,7 +1173,7 @@ function menu_list_system_menus() { * Return an array of links to be rendered as the Primary links. */ function menu_primary_links() { - return menu_navigation_links('primary-links'); + return menu_navigation_links(variable_get('menu_primary_links_source', 'primary-links')); } /** @@ -1183,11 +1183,11 @@ function menu_secondary_links() { // If the secondary menu source is set as the primary menu, we display the // second level of the primary menu. - if (variable_get('menu_secondary_links_source', 'secondary-links') == 'primary-links') { - return menu_navigation_links('primary-links', 1); + if (variable_get('menu_secondary_links_source', 'secondary-links') == variable_get('menu_primary_links_source', 'primary-links')) { + return menu_navigation_links(variable_get('menu_primary_links_source', 'primary-links'), 1); } else { - return menu_navigation_links('secondary-links', 0); + return menu_navigation_links(variable_get('menu_secondary_links_source', 'secondary-links'), 0); } } -- cgit v1.2.3