From 116f8b6428eee4c0748c36f536f7c2155c0ad905 Mon Sep 17 00:00:00 2001 From: webchick Date: Mon, 18 Jul 2011 01:04:29 -0700 Subject: Issue #898634 by catch, alex_b, chx: Fixed install_drupal(): call to menu-touching functions results in SQL syntax error. --- includes/menu.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'includes') diff --git a/includes/menu.inc b/includes/menu.inc index f23632510..5582c452e 100644 --- a/includes/menu.inc +++ b/includes/menu.inc @@ -431,6 +431,11 @@ function menu_get_item($path = NULL, $router_item = NULL) { $router_items[$path] = $router_item; } if (!isset($router_items[$path])) { + // Rebuild if we know it's needed, or if the menu masks are missing which + // occurs rarely, likely due to a race condition of multiple rebuilds. + if (variable_get('menu_rebuild_needed', FALSE) || !variable_get('menu_masks', array())) { + menu_rebuild(); + } $original_map = arg(NULL, $path); // Since there is no limit to the length of $path, use a hash to keep it @@ -490,11 +495,6 @@ function menu_execute_active_handler($path = NULL, $deliver = TRUE) { // Only continue if the site status is not set. if ($page_callback_result == MENU_SITE_ONLINE) { - // Rebuild if we know it's needed, or if the menu masks are missing which - // occurs rarely, likely due to a race condition of multiple rebuilds. - if (variable_get('menu_rebuild_needed', FALSE) || !variable_get('menu_masks', array())) { - menu_rebuild(); - } if ($router_item = menu_get_item($path)) { if ($router_item['access']) { if ($router_item['include_file']) { -- cgit v1.2.3