diff --git a/includes/menu.inc b/includes/menu.inc index 2be0903..45ad282 100644 --- a/includes/menu.inc +++ b/includes/menu.inc @@ -2823,9 +2823,10 @@ function _menu_navigation_links_rebuild($menu) { // check this for parents instead of querying the database. $parent_candidates = array(); // Make sure no child comes before its parent. - array_multisort($sort, SORT_NUMERIC, $menu_links); + asort($sort, SORT_NUMERIC); - foreach ($menu_links as $key => $item) { + foreach (array_keys($sort) as $path) { + $item = $menu_links[$path]; $existing_item = db_select('menu_links') ->fields('menu_links') ->condition('link_path', $item['path']) @@ -2853,7 +2854,7 @@ function _menu_navigation_links_rebuild($menu) { $item = _menu_link_build($item); menu_link_save($item, $existing_item, $parent_candidates); $parent_candidates[$item['mlid']] = $item; - unset($menu_links[$key]); + unset($menu_links[$path]); } } } @@ -3616,9 +3617,9 @@ function _menu_router_build($callbacks) { $sort[$path] = $number_parts; } } - array_multisort($sort, SORT_NUMERIC, $menu); + asort($sort, SORT_NUMERIC); // Apply inheritance rules. - foreach ($menu as $path => $v) { + foreach (array_keys($sort) as $path) { $item = &$menu[$path]; if (!$item['_tab']) { // Non-tab items.