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

#213664 by chx, theborg: menu item not expanded on front page

6.x
Gábor Hojtsy 2008-01-28 19:09:19 +00:00
parent 1c6cd92a12
commit bf28630a5e
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
includes/menu.inc
View File

@ -451,7 +451,7 @@ function _menu_check_access(&$item, $map) {
/** /**
* Localize the router item title using t() or another callback. * Localize the router item title using t() or another callback.
* *
* Translate the title and description to allow storage of English title * Translate the title and description to allow storage of English title
* strings in the database, yet display of them in the language required * strings in the database, yet display of them in the language required
* by the current user. * by the current user.
@ -834,7 +834,13 @@ function menu_tree_page_data($menu_name = 'navigation') {
// Build and run the query, and build the tree. // Build and run the query, and build the tree.
if ($item['access']) { if ($item['access']) {
// Check whether a menu link exists that corresponds to the current path. // Check whether a menu link exists that corresponds to the current path.
$parents = db_fetch_array(db_query("SELECT p1, p2, p3, p4, p5, p6, p7, p8 FROM {menu_links} WHERE menu_name = '%s' AND link_path = '%s'", $menu_name, $item['href'])); $args = array($menu_name, $item['href']);
$placeholders = "'%s'";
if (drupal_is_front_page()) {
$args[] = '<front>';
$placeholders .= ", '%s'";
}
$parents = db_fetch_array(db_query("SELECT p1, p2, p3, p4, p5, p6, p7, p8 FROM {menu_links} WHERE menu_name = '%s' AND link_path IN (". $placeholders .")", $args));
if (empty($parents)) { if (empty($parents)) {
// If no link exists, we may be on a local task that's not in the links. // If no link exists, we may be on a local task that's not in the links.