diff options
| author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-03-07 07:44:18 +0000 |
|---|---|---|
| committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-03-07 07:44:18 +0000 |
| commit | 3205a26755ecf71b4d8503359c2ff1910254f322 (patch) | |
| tree | 347bdfc3befa2879e8a62b6eed205dc911b9259c /includes/menu.inc | |
| parent | a2232c40eed8afee0a9b38b587e4895cc11c26da (diff) | |
| download | brdo-3205a26755ecf71b4d8503359c2ff1910254f322.tar.gz brdo-3205a26755ecf71b4d8503359c2ff1910254f322.tar.bz2 | |
#282191 follow-up by plach: Remove ambitious parts of translatable fields UI from core that are no longer relevant, given what made it into Drupal 7.
Diffstat (limited to 'includes/menu.inc')
| -rw-r--r-- | includes/menu.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/includes/menu.inc b/includes/menu.inc index dedb04a10..c3ba10123 100644 --- a/includes/menu.inc +++ b/includes/menu.inc @@ -969,7 +969,7 @@ function menu_tree_all_data($menu_name, $link = NULL, $max_depth = NULL) { // Use $mlid as a flag for whether the data being loaded is for the whole tree. $mlid = isset($link['mlid']) ? $link['mlid'] : 0; // Generate a cache ID (cid) specific for this $menu_name, $link, $language, and depth. - $cid = 'links:' . $menu_name . ':all-cid:' . $mlid . ':' . $GLOBALS['language_interface']->language . ':' . (int)$max_depth; + $cid = 'links:' . $menu_name . ':all-cid:' . $mlid . ':' . $GLOBALS['language']->language . ':' . (int)$max_depth; if (!isset($tree[$cid])) { // If the static variable doesn't have the data, check {cache_menu}. @@ -1081,7 +1081,7 @@ function menu_tree_page_data($menu_name, $max_depth = NULL) { $max_depth = min($max_depth, MENU_MAX_DEPTH); } // Generate a cache ID (cid) specific for this page. - $cid = 'links:' . $menu_name . ':page-cid:' . $item['href'] . ':' . $GLOBALS['language_interface']->language . ':' . (int)$item['access'] . ':' . (int)$max_depth; + $cid = 'links:' . $menu_name . ':page-cid:' . $item['href'] . ':' . $GLOBALS['language']->language . ':' . (int)$item['access'] . ':' . (int)$max_depth; if (!isset($tree[$cid])) { // If the static variable doesn't have the data, check {cache_menu}. @@ -1229,7 +1229,7 @@ function menu_tree_page_data($menu_name, $max_depth = NULL) { * Helper function - compute the real cache ID for menu tree data. */ function _menu_tree_cid($menu_name, $data) { - return 'links:' . $menu_name . ':tree-data:' . $GLOBALS['language_interface']->language . ':' . md5(serialize($data)); + return 'links:' . $menu_name . ':tree-data:' . $GLOBALS['language']->language . ':' . md5(serialize($data)); } /** |