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
ccdeae8d
Commit
ccdeae8d
authored
Sep 22, 2008
by
webchick
Browse files
#238760
follow-up by pwolanin: Forward-port rest of 6.x fix for menu_rebuild() race condition.
parent
784b01b1
Changes
1
Hide whitespace changes
Inline
Side-by-side
includes/menu.inc
View file @
ccdeae8d
...
...
@@ -2340,10 +2340,11 @@ function _menu_router_build($callbacks) {
}
array_multisort
(
$sort
,
SORT_NUMERIC
,
$menu
);
if
(
$menu
)
{
// Delete the existing router since we have some data to replace it.
db_query
(
'DELETE FROM {menu_router}'
);
if
(
!
$menu
)
{
return
array
();
}
// Delete the existing router since we have some data to replace it.
db_query
(
'DELETE FROM {menu_router}'
);
// Apply inheritance rules.
foreach
(
$menu
as
$path
=>
$v
)
{
$item
=
&
$menu
[
$path
];
...
...
Write
Preview
Supports
Markdown
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