Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
project
drupal
Commits
682c4cc2
Commit
682c4cc2
authored
May 30, 2007
by
Dries
Browse files
- Patch
#147873
by hswong3i: made menu.inc Oracle-friendly.
parent
9c79a1f8
Changes
1
Hide whitespace changes
Inline
Side-by-side
includes/menu.inc
View file @
682c4cc2
...
...
@@ -637,7 +637,8 @@ 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 *, 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.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
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
);
cache_set
(
$cid
,
$tree
[
$cid
],
'cache_menu'
);
...
...
@@ -924,7 +925,7 @@ function menu_local_tasks($level = 0) {
return
array
();
}
// Get all tabs
$result
=
db_query
(
"SELECT * FROM
{
menu_router
}
WHERE tab_root = '%s' AND tab_parent
!= ''
ORDER BY weight, title"
,
$router_item
[
'tab_root'
]);
$result
=
db_query
(
"SELECT * FROM
{
menu_router
}
WHERE tab_root = '%s' AND tab_parent
IS NOT NULL
ORDER BY weight, title"
,
$router_item
[
'tab_root'
]);
$map
=
arg
();
$children
=
array
();
$tab_parent
=
array
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment