From 80f911c9692933a7be5e8d80334271ab2e45f0c5 Mon Sep 17 00:00:00 2001 From: Dries Buytaert Date: Mon, 17 May 2010 18:47:25 +0000 Subject: - Patch #800696 by David_Rothstein: reenabling a module causes the module's links to be incorrectly mixed with custom menu links. --- includes/menu.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'includes') diff --git a/includes/menu.inc b/includes/menu.inc index e146f318c..cbd2b595a 100644 --- a/includes/menu.inc +++ b/includes/menu.inc @@ -3145,7 +3145,7 @@ function _menu_router_build($callbacks) { // previous iteration assigned one already), try to find the menu name // of the parent item in the currently stored menu links. if (!isset($parent['menu_name'])) { - $menu_name = db_query("SELECT menu_name FROM {menu_links} WHERE router_path = :router_path", array(':router_path' => $parent_path))->fetchField(); + $menu_name = db_query("SELECT menu_name FROM {menu_links} WHERE router_path = :router_path AND module = 'system'", array(':router_path' => $parent_path))->fetchField(); if ($menu_name) { $parent['menu_name'] = $menu_name; } -- cgit v1.2.3