only in patch2: unchanged: --- a/modules/book/book.module +++ b/modules/book/book.module @@ -1417,7 +1434,6 @@ function book_menu_subtree_data($link) { } $data['tree'] = menu_tree_data($links, array(), $link['depth']); $data['node_links'] = array(); - menu_tree_collect_node_links($data['tree'], $data['node_links']); // Compute the real cid for book subtree data. $tree_cid = 'links:' . $item['menu_name'] . ':subtree-data:' . hash('sha256', serialize($data)); // Cache the data, if it is not already in the cache. @@ -1429,7 +1445,7 @@ function book_menu_subtree_data($link) { cache_set($cid, $tree_cid, 'cache_menu'); } // Check access for the current user to each item in the tree. - menu_tree_check_access($data['tree'], $data['node_links']); + menu_tree_check_access($data['tree']); $tree[$cid] = $data['tree']; } --- a/modules/menu/menu.admin.inc +++ b/modules/menu/menu.admin.inc @@ -61,10 +61,9 @@ function menu_overview_form($form, &$form_state, $menu) { } $tree = menu_tree_data($links); $node_links = array(); - menu_tree_collect_node_links($tree, $node_links); // We indicate that a menu administrator is running the menu access check. $menu_admin = TRUE; - menu_tree_check_access($tree, $node_links); + menu_tree_check_access($tree); $menu_admin = FALSE; $form = array_merge($form, _menu_overview_tree_form($tree)); only in patch2: unchanged: --- a/modules/menu/menu.admin.inc +++ b/modules/menu/menu.admin.inc @@ -61,10 +61,9 @@ function menu_overview_form($form, &$form_state, $menu) { } $tree = menu_tree_data($links); $node_links = array(); - menu_tree_collect_node_links($tree, $node_links); // We indicate that a menu administrator is running the menu access check. $menu_admin = TRUE; - menu_tree_check_access($tree, $node_links); + menu_tree_check_access($tree); $menu_admin = FALSE; $form = array_merge($form, _menu_overview_tree_form($tree));