diff --git a/core/includes/menu.inc b/core/includes/menu.inc index 3ba3b5d..44db1d3 100644 --- a/core/includes/menu.inc +++ b/core/includes/menu.inc @@ -1957,8 +1957,6 @@ function menu_local_tasks($level = 0) { if (!isset($data)) { $data = array(); - // Set defaults in case there are no actions or tabs. - $actions = $empty['actions']; $tabs = array(); // Look for route-based tabs. @@ -2096,7 +2094,6 @@ function menu_local_tasks($level = 0) { // Find all tabs at the same level or above the current one. $parent = $router_item['tab_parent']; $path = $router_item['path']; - $current = $router_item; $depth = 1000; while (isset($children[$parent])) { $tabs_current = array(); @@ -2479,7 +2476,7 @@ function menu_set_active_trail($new_trail = NULL) { // a stripped down menu tree containing the active trail only, in case // the given menu has not been built in this request yet. $tree = menu_tree_page_data($preferred_link['menu_name'], NULL, TRUE); - list($key, $curr) = each($tree); + list(, $curr) = each($tree); } // There is no link for the current path. else { @@ -2509,7 +2506,7 @@ function menu_set_active_trail($new_trail = NULL) { } $tree = $curr['below'] ? $curr['below'] : array(); } - list($key, $curr) = each($tree); + list(, $curr) = each($tree); } // Make sure the current page is in the trail to build the page title, by // appending either the preferred link or the menu router item for the @@ -2704,7 +2701,7 @@ function menu_router_rebuild() { $transaction = db_transaction(); try { - list($menu, $masks) = menu_router_build(TRUE); + list($menu,) = menu_router_build(TRUE); _menu_navigation_links_rebuild($menu); // Clear the menu, page and block caches. menu_cache_clear_all(); @@ -2804,7 +2801,7 @@ function menu_get_router() { // Check first if we have it in memory already. $menu = _menu_router_cache(); if (empty($menu)) { - list($menu, $masks) = menu_router_build(); + list($menu, ) = menu_router_build(); } return $menu; } @@ -3018,7 +3015,7 @@ function _menu_find_router_path($link_path) { elseif (!isset($menu[$router_path])) { // Add an empty router path as a fallback. $ancestors[] = ''; - foreach ($ancestors as $key => $router_path) { + foreach ($ancestors as $router_path) { if (isset($menu[$router_path])) { // Exit the loop leaving $router_path as the first match. break; @@ -3309,7 +3306,7 @@ function _menu_router_save($menu, $masks) { $num_records = 0; - foreach ($menu as $path => $item) { + foreach ($menu as $item) { // Fill in insert object values. $insert->values(array( 'path' => $item['path'],