? 431300-nodejs-authoredby-D7.patch
? 431300-nodejs-authoredby-D7_0.patch
? 784856.patch
? 787152-admin-node-permissions.patch
? sites/all
? sites/default
? sites/example.sites.php
Index: includes/menu.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/menu.inc,v
retrieving revision 1.388
diff -u -p -r1.388 menu.inc
--- includes/menu.inc	1 May 2010 08:12:22 -0000	1.388
+++ includes/menu.inc	3 May 2010 06:14:11 -0000
@@ -1552,22 +1552,6 @@ function menu_set_custom_theme() {
 }
 
 /**
- * Build a list of named menus.
- */
-function menu_get_names() {
-  $names = &drupal_static(__FUNCTION__);
-
-  if (empty($names)) {
-    $names = db_select('menu_links')
-      ->distinct()
-      ->fields('menu_links', array('menu_name'))
-      ->orderBy('menu_name')
-      ->execute()->fetchCol();
-  }
-  return $names;
-}
-
-/**
  * Return an array containing the names of system-defined (default) menus.
  */
 function menu_list_system_menus() {
Index: modules/simpletest/tests/menu.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/tests/menu.test,v
retrieving revision 1.29
diff -u -p -r1.29 menu.test
--- modules/simpletest/tests/menu.test	26 Apr 2010 14:06:23 -0000	1.29
+++ modules/simpletest/tests/menu.test	3 May 2010 06:14:11 -0000
@@ -194,31 +194,6 @@ class MenuRouterTestCase extends DrupalW
   }
 
   /**
-   * Test menu_get_names().
-   */
-  function testMenuGetNames() {
-    // Create three menu items.
-    for ($i = 0; $i < 3; $i++) {
-      $menu_link = array(
-        'link_title' => 'Menu link #' . $i,
-        'link_path' => 'menu_test/' . $i,
-        'module' => 'menu_test',
-        'menu_name' => 'menu_test_' . $i,
-      );
-      menu_link_save($menu_link);
-    }
-
-    drupal_static_reset('menu_get_names');
-
-    // Verify that the menu names are correctly reported by menu_get_names().
-    $menu_names = menu_get_names();
-    $this->pass(implode(' | ', $menu_names));
-    for ($i = 0; $i < 3; $i++) {
-      $this->assertTrue(in_array('menu_test_' . $i, $menu_names), t('Expected menu name %expected is returned.', array('%expected' => 'menu_test_' . $i)));
-    }
-  }
-
-  /**
    * Tests for menu_name parameter for hook_menu().
    */
   function testMenuName() {