From bb43013da3cde6b8b02897f7737d48c541b321f5 Mon Sep 17 00:00:00 2001 From: Mark Carver Date: Fri, 12 Jan 2018 23:26:58 -0600 Subject: [PATCH] Issue #2934821 by markcarver: [REGRESSION] Menus break because all menu items are loaded Signed-off-by: Mark Carver --- templates/system/page.vars.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/system/page.vars.php b/templates/system/page.vars.php index 035e8ef..02efca6 100644 --- a/templates/system/page.vars.php +++ b/templates/system/page.vars.php @@ -38,7 +38,7 @@ function bootstrap_preprocess_page(&$variables) { $variables['primary_nav'] = FALSE; if ($variables['main_menu']) { // Load the tree - $tree = menu_tree_all_data(variable_get('menu_main_links_source', 'main-menu')); + $tree = menu_tree_page_data(variable_get('menu_main_links_source', 'main-menu')); // Localize the tree. if ($i18n) { @@ -56,7 +56,7 @@ function bootstrap_preprocess_page(&$variables) { $variables['secondary_nav'] = FALSE; if ($variables['secondary_menu']) { // Load the tree - $tree = menu_tree_all_data(variable_get('menu_secondary_links_source', 'user-menu')); + $tree = menu_tree_page_data(variable_get('menu_secondary_links_source', 'user-menu')); // Localize the tree. if ($i18n) { -- 2.15.1