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

comparison includes/menu.inc @ 11:589fb7c02327 6.5

Drupal 6.5

author	Franck Deroche <webmaster@defr.org>
date	Tue, 23 Dec 2008 14:32:19 +0100
parents	fff6d4c8c043
children	8b6c45761e01

comparison

equal deleted inserted replaced

-:6f15c9d74937
+:589fb7c02327
 <?php
-// $Id: menu.inc,v 1.255.2.17 2008/07/09 15:23:50 goba Exp $
+// $Id: menu.inc,v 1.255.2.21 2008/10/08 12:33:55 goba Exp $
 /**
 * @file
 * API for the Drupal menu system.
 */
 */
 function menu_execute_active_handler($path = NULL) {
 if (_menu_site_is_offline()) {
 return MENU_SITE_OFFLINE;
 }
-if (variable_get('menu_rebuild_needed', FALSE)) {
+// Rebuild if we know it's needed, or if the menu masks are missing which
+// occurs rarely, likely due to a race condition of multiple rebuilds.
+if (variable_get('menu_rebuild_needed', FALSE) || !variable_get('menu_masks', array())) {
 menu_rebuild();
 }
 if ($router_item = menu_get_item($path)) {
 if ($router_item['access']) {
 if ($router_item['file']) {
 * @param $map
 *   An array of path arguments (ex: array('node', '5'))
 * @return
 *   Returns TRUE for success, FALSE if an object cannot be loaded.
 *   Names of object loading functions are placed in $item['load_functions'].
 *   Loaded objects are placed in $map[]; keys are the same as keys in the
 *   $item['load_functions'] array.
 *   $item['access'] is set to FALSE if an object cannot be loaded.
 */
 function _menu_load_objects(&$item, &$map) {
 if ($load_functions = $item['load_functions']) {
 *   TRUE if we are translating a menu link item; FALSE if we are
 *   translating a menu router item.
 * @return
 *   No return value.
 *   $item['title'] is localized according to $item['title_callback'].
 *   If an item's callback is check_plain(), $item['options']['html'] becomes
 *   TRUE.
 *   $item['description'] is translated using t().
 *   When doing link translation and the $item['options']['attributes']['title']
 *   (link title attribute) matches the description, it is translated as well.
 */
 function _menu_item_localize(&$item, $map, $link_translate = FALSE) {
 $callback = $item['title_callback'];
 $item['localized_options'] = $item['options'];
 // For performance, don't localize a link the user can't access.
 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.
 if (!empty($item['options']['alter'])) {
 drupal_alter('translated_menu_link', $item, $map);
 }
 return $map;
 }
 /**
 * Get a loaded object from a router item.
 * Returns the help associated with the active menu item.
 */
 function menu_get_active_help() {
 $output = '';
 $router_path = menu_tab_root_path();
+// We will always have a path unless we are on a 403 or 404.
+if (!$router_path) {
+return '';
+}
 $arg = drupal_help_arg(arg(NULL));
 $empty_arg = drupal_help_arg();
 foreach (module_list() as $name) {
 /**
 * Get the breadcrumb for the current page, as determined by the active trail.
 */
 function menu_get_active_breadcrumb() {
 $breadcrumb = array();
 // No breadcrumb for the front page.
 if (drupal_is_front_page()) {
 return $breadcrumb;
 }
 foreach ($menu_links as $item) {
 $existing_item = db_fetch_array(db_query("SELECT mlid, menu_name, plid, customized, has_children, updated FROM {menu_links} WHERE link_path = '%s' AND module = '%s'", $item['link_path'], 'system'));
 if ($existing_item) {
 $item['mlid'] = $existing_item['mlid'];
-$item['menu_name'] = $existing_item['menu_name'];
+// A change in hook_menu may move the link to a different menu
-$item['plid'] = $existing_item['plid'];
+if (empty($item['menu_name']) || ($item['menu_name'] == $existing_item['menu_name'])) {
+$item['menu_name'] = $existing_item['menu_name'];
+$item['plid'] = $existing_item['plid'];
+}
 $item['has_children'] = $existing_item['has_children'];
 $item['updated'] = $existing_item['updated'];
 }
 if (!$existing_item || !$existing_item['customized']) {
 menu_link_save($item);
 *   - expanded    whether the item is expanded.
 *   - options     An array of options, @see l for more.
 *   - mlid        Set to an existing value, or 0 or NULL to insert a new link.
 *   - plid        The mlid of the parent.
 *   - router_path The path of the relevant router item.
+* @return
+*   The mlid of the saved menu link, or FALSE if the menu link could not be
+*   saved.
 */
 function menu_link_save(&$item) {
 $menu = menu_router_build();
 drupal_alter('menu_link', $item, $menu);
 );
 return menu_link_save($menu_link);
 break;
 case 'update':
 db_query("UPDATE {menu_links} SET link_title = '%s' WHERE link_path = '%s' AND customized = 0 AND module = '%s'", $link_title, $link_path, $module);
-menu_cache_clear();
+$result = db_query("SELECT menu_name FROM {menu_links} WHERE link_path = '%s' AND customized = 0 AND module = '%s'", $link_path, $module);
+while ($item = db_fetch_array($result)) {
+menu_cache_clear($item['menu_name']);
+}
 break;
 case 'delete':
 menu_link_delete(NULL, $link_path);
 break;
 }

Mercurial > defr > drupal > core

comparison includes/menu.inc @ 11:589fb7c02327 6.5