summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2007-05-31 11:54:39 +0000
committerDries Buytaert <dries@buytaert.net>2007-05-31 11:54:39 +0000
commit97a09cb9980cb4247dd9c339e8c7819a00093e61 (patch)
tree9924fc2c36a458e7e42f2293cb0e255b1c962980 /includes
parente5738122cb2c38eec03e0d9b8319236ba8ccbefa (diff)
downloadbrdo-97a09cb9980cb4247dd9c339e8c7819a00093e61.tar.gz
brdo-97a09cb9980cb4247dd9c339e8c7819a00093e61.tar.bz2
- Patch #147873 by hswong3i: menu SQL fix.
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 7d645ea35..c996da508 100644
--- a/includes/menu.inc
+++ b/includes/menu.inc
@@ -637,7 +637,7 @@ function menu_tree_all_data($menu_name = 'navigation', $item = NULL, $show_hidde
}
array_unshift($args, $menu_name);
list(, $tree[$cid]) = _menu_tree_data(db_query("
- SELECT m.*, ml.menu_name, ml.mlid, ml.plid, ml.href, ml.router_path, ml.hidden, ml.external, ml.has_children, ml.expanded, ml.weight + 50000 AS weight, ml.depth, ml.p1, ml.p2, ml.p3, ml.p4, ml.p5, ml.p6, ml.module, ml.link_title, ml.options
+ SELECT m.*, ml.menu_name, ml.mlid, ml.plid, ml.link_path, ml.router_path, ml.hidden, ml.external, ml.has_children, ml.expanded, ml.weight + 50000 AS weight, ml.depth, ml.p1, ml.p2, ml.p3, ml.p4, ml.p5, ml.p6, ml.module, ml.link_title, ml.options
FROM {menu_links} ml LEFT JOIN {menu_router} m ON m.path = ml.router_path
WHERE ml.menu_name = '%s'". $where ."
ORDER BY p1 ASC, p2 ASC, p3 ASC, p4 ASC, p5 ASC", $args), $parents);