defr/drupal/core: includes/menu.inc comparison

comparison includes/menu.inc @ 7:fff6d4c8c043 6.3

Drupal 6.3

author	Franck Deroche <webmaster@defr.org>
date	Tue, 23 Dec 2008 14:30:28 +0100
parents	2427550111ae
children	589fb7c02327

comparison

equal deleted inserted replaced

-:2cfdc3c92142
+:fff6d4c8c043
 <?php
-// $Id: menu.inc,v 1.255.2.11 2008/04/09 21:11:44 goba Exp $
+// $Id: menu.inc,v 1.255.2.17 2008/07/09 15:23:50 goba Exp $
 /**
 * @file
 * API for the Drupal menu system.
 */
 // Translate description, see the motivation above.
 if (!empty($item['description'])) {
 $original_description = $item['description'];
 $item['description'] = t($item['description']);
-if ($link_translate && $item['options']['attributes']['title'] == $original_description) {
+if ($link_translate && isset($item['options']['attributes']['title']) && $item['options']['attributes']['title'] == $original_description) {
 $item['localized_options']['attributes']['title'] = $item['description'];
 }
 }
 }
 }
 }
 $router_item['href'] = implode('/', $link_map);
 $router_item['options'] = array();
 _menu_check_access($router_item, $map);
-_menu_item_localize($router_item, $map);
+// For performance, don't localize an item the user can't access.
+if ($router_item['access']) {
+_menu_item_localize($router_item, $map);
+}
 return $map;
 }
 /**
 $item['access'] = FALSE;
 return FALSE;
 }
 _menu_check_access($item, $map);
 }
+// For performance, don't localize a link the user can't access.
-_menu_item_localize($item, $map, TRUE);
+if ($item['access']) {
+_menu_item_localize($item, $map, TRUE);
+}
 }
 // Allow other customizations - e.g. adding a page-specific query string to the
 // options array. For performance reasons we only invoke this hook if the link
 // has the 'alter' flag set in the options array.
 foreach ($tree as $item) {
 if (!$item['link']['hidden']) {
 $l = $item['link']['localized_options'];
 $l['href'] = $item['link']['href'];
 $l['title'] = $item['link']['title'];
+if ($item['link']['in_active_trail']) {
+if (empty($l['attributes']['class'])) {
+$l['attributes']['class'] = 'active-trail';
+}
+else {
+$l['attributes']['class'] .= ' active-trail';
+}
+}
 // Keyed with unique menu id to generate classes from theme_links().
 $links['menu-'. $item['link']['mlid']] = $l;
 }
 }
 return $links;
 if ($curr['link']['href'] == $item['href']) {
 $trail[] = $curr['link'];
 $curr = FALSE;
 }
 else {
-// Move to the child link if it's in the active trail.
+// Add the link if it's in the active trail, then move to the link below.
-if ($curr['below'] && $curr['link']['in_active_trail']) {
+if ($curr['link']['in_active_trail']) {
 $trail[] = $curr['link'];
-$tree = $curr['below'];
+$tree = $curr['below'] ? $curr['below'] : array();
 }
 list($key, $curr) = each($tree);
 }
 }
 // Make sure the current page is in the trail (needed for the page title),
 if (!isset($menu) || $reset) {
 if (!$reset && ($cache = cache_get('router:', 'cache_menu')) && isset($cache->data)) {
 $menu = $cache->data;
 }
 else {
-db_query('DELETE FROM {menu_router}');
 // We need to manually call each module so that we can know which module
 // a given item came from.
 $callbacks = array();
 foreach (module_implements('menu') as $module) {
 $router_items = call_user_func($module .'_menu');
 }
 }
 // Alter the menu as defined in modules, keys are like user/%user.
 drupal_alter('menu', $callbacks);
 $menu = _menu_router_build($callbacks);
-cache_set('router:', $menu, 'cache_menu');
 }
 }
 return $menu;
 }
 $sort[$path] = $number_parts;
 }
 }
 array_multisort($sort, SORT_NUMERIC, $menu);
+if (!$menu) {
+// We must have a serious error - there is no data to save.
+watchdog('php', 'Menu router rebuild failed - some paths may not work correctly.', array(), WATCHDOG_ERROR);
+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];
 if (!$item['_tab']) {
 // Non-tab items.
 }
 // Sort the masks so they are in order of descending fit, and store them.
 $masks = array_keys($masks);
 rsort($masks);
 variable_set('menu_masks', $masks);
+cache_set('router:', $menu, 'cache_menu');
 return $menu;
 }
 /**
 * Returns TRUE if a path is external (e.g. http://example.com).

Mercurial > defr > drupal > core

comparison includes/menu.inc @ 7:fff6d4c8c043 6.3