summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2010-05-17 18:47:25 +0000
committerDries Buytaert <dries@buytaert.net>2010-05-17 18:47:25 +0000
commit80f911c9692933a7be5e8d80334271ab2e45f0c5 (patch)
tree3c7d71951f0ebd889917cedcad62a7ca6b9c8199 /includes
parent1c9b84ad39a6df1e154396267301fea6e0a49750 (diff)
downloadbrdo-80f911c9692933a7be5e8d80334271ab2e45f0c5.tar.gz
brdo-80f911c9692933a7be5e8d80334271ab2e45f0c5.tar.bz2
- Patch #800696 by David_Rothstein: reenabling a module causes the module's links to be incorrectly mixed with custom menu links.
Diffstat (limited to 'includes')
-rw-r--r--includes/menu.inc2
1 files changed, 1 insertions, 1 deletions
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;
}