Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

- Patch #964822 by pwolanin: small optimization for menu_get_item().

merge-requests/26/head
Dries Buytaert 2010-11-07 21:51:40 +00:00
parent 7537eec11c
commit 9f64d0e46c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
includes/menu.inc
View File

@ -413,8 +413,6 @@ function menu_get_item($path = NULL, $router_item = NULL) {
} }
if (!isset($router_items[$path])) { if (!isset($router_items[$path])) {
$original_map = arg(NULL, $path); $original_map = arg(NULL, $path);
$parts = array_slice($original_map, 0, MENU_MAX_PARTS);
$ancestors = menu_get_ancestors($parts);
// Since there is no limit to the length of $path, use a hash to keep it // Since there is no limit to the length of $path, use a hash to keep it
// short yet unique. // short yet unique.
@ -423,6 +421,8 @@ function menu_get_item($path = NULL, $router_item = NULL) {
$router_item = $cached->data; $router_item = $cached->data;
} }
else { else {
$parts = array_slice($original_map, 0, MENU_MAX_PARTS);
$ancestors = menu_get_ancestors($parts);
$router_item = db_query_range('SELECT * FROM {menu_router} WHERE path IN (:ancestors) ORDER BY fit DESC', 0, 1, array(':ancestors' => $ancestors))->fetchAssoc(); $router_item = db_query_range('SELECT * FROM {menu_router} WHERE path IN (:ancestors) ORDER BY fit DESC', 0, 1, array(':ancestors' => $ancestors))->fetchAssoc();
cache_set($cid, $router_item, 'cache_menu'); cache_set($cid, $router_item, 'cache_menu');
} }