diff options
author | Dries Buytaert <dries@buytaert.net> | 2007-06-01 09:40:40 +0000 |
---|---|---|
committer | Dries Buytaert <dries@buytaert.net> | 2007-06-01 09:40:40 +0000 |
commit | 7744bd90c5dc3188ec974909a8fc78b916df738c (patch) | |
tree | e4002544f840e851728c1ef6c2375b964a1a429d | |
parent | 7b053cc92c6a1e8b48301817643c5e62d01f7dd8 (diff) | |
download | brdo-7744bd90c5dc3188ec974909a8fc78b916df738c.tar.gz brdo-7744bd90c5dc3188ec974909a8fc78b916df738c.tar.bz2 |
- Patch #147873 by hswong3i: made an SQL query Oracle-friendly.
-rw-r--r-- | includes/menu.inc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/includes/menu.inc b/includes/menu.inc index c996da508..a140c1734 100644 --- a/includes/menu.inc +++ b/includes/menu.inc @@ -708,7 +708,8 @@ function menu_tree_page_data($menu_name = 'navigation') { // LEFT JOIN since there is no match in {menu_router} for an external link. // No need to order by p6 - there is a sort by weight later. list(, $tree[$cid]) = _menu_tree_data(db_query(" - SELECT *, ml.weight + 50000 AS weight FROM {menu_links} ml LEFT JOIN {menu_router} m ON m.path = ml.router_path + 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' AND ml.plid IN (". $placeholders .") AND ml.hidden = 0 ORDER BY p1 ASC, p2 ASC, p3 ASC, p4 ASC, p5 ASC", $args), $parents); cache_set($cid, $tree[$cid], 'cache_menu'); |