commit 6880b6db2eacda570b98e1bc2f2b0ec6e738e513 Author: Andy Postnikov Date: Thu Nov 1 01:53:53 2012 +0400 get rid of menu_load_all() diff --git a/core/modules/menu/menu.module b/core/modules/menu/menu.module index 02c025e..05bfe7f 100644 --- a/core/modules/menu/menu.module +++ b/core/modules/menu/menu.module @@ -250,7 +250,6 @@ function menu_enable() { $base_link = db_query("SELECT mlid AS plid, menu_name FROM {menu_links} WHERE link_path = 'admin/structure/menu' AND module = 'system'")->fetchAssoc(); $base_link['router_path'] = 'admin/structure/menu/manage/%'; $base_link['module'] = 'menu'; - //$result = db_query("SELECT * FROM {menu_custom}", array(), array('fetch' => PDO::FETCH_ASSOC)); $menus = entity_load_multiple('menu'); foreach ($menus as $menu) { // $link is passed by reference to menu_link_save(), so we make a copy of $base_link. @@ -283,16 +282,6 @@ function menu_load($menu_name) { } /** - * Load all custom menu data. - * - * @return - * Array of custom menu data. - */ -function menu_load_all() { - return entity_load_multiple('menu'); -} - -/** * Save a custom menu. * * @param Drupal\menu\Plugin\Core\Entity\Menu $menu @@ -839,7 +828,7 @@ function menu_form_node_type_form_alter(&$form, $form_state) { * titles as the values. */ function menu_get_menus($all = TRUE) { - if ($custom_menus = menu_load_all()) { + if ($custom_menus = entity_load_multiple('menu')) { if (!$all) { $custom_menus = array_diff_key($custom_menus, menu_list_system_menus()); }