? bug_399070_menu_inconsistent_length_check.patch
? issue_408562_book_module_double_quotes.patch
? move_menu_api_contents.patch
? move_menu_api_contents_01.patch
? move_menu_api_contents_02.patch
? sites/default/files
? sites/default/settings.php
Index: modules/menu/menu.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/menu/menu.admin.inc,v
retrieving revision 1.42
diff -u -p -r1.42 menu.admin.inc
--- modules/menu/menu.admin.inc	20 Mar 2009 19:18:10 -0000	1.42
+++ modules/menu/menu.admin.inc	22 Mar 2009 20:07:05 -0000
@@ -510,13 +510,10 @@ function menu_delete_menu_confirm_submit
  */
 function menu_edit_menu_validate($form, &$form_state) {
   $item = $form_state['values'];
-  if (preg_match('/[^a-z0-9-]/', $item['menu_name'])) {
-    form_set_error('menu_name', t('The menu name may only consist of lowercase letters, numbers, and hyphens.'));
-  }
-  if (strlen($item['menu_name']) > MENU_MAX_MENU_NAME_LENGTH_UI) {
-    form_set_error('menu_name', format_plural(MENU_MAX_MENU_NAME_LENGTH_UI, "The menu name can't be longer than 1 character.", "The menu name can't be longer than @count characters."));
-  }
   if ($form['#insert']) {
+    if (preg_match('/[^a-z0-9-]/', $item['menu_name'])) {
+      form_set_error('menu_name', t('The menu name may only consist of lowercase letters, numbers, and hyphens.'));
+    }
     // We will add 'menu-' to the menu name to help avoid name-space conflicts.
     $item['menu_name'] = 'menu-' . $item['menu_name'];
     if (db_result(db_query("SELECT menu_name FROM {menu_custom} WHERE menu_name = '%s'", $item['menu_name'])) ||
Index: modules/menu/menu.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/menu/menu.test,v
retrieving revision 1.7
diff -u -p -r1.7 menu.test
--- modules/menu/menu.test	16 Mar 2009 20:31:11 -0000	1.7
+++ modules/menu/menu.test	22 Mar 2009 20:06:02 -0000
@@ -90,7 +90,7 @@ class MenuTestCase extends DrupalWebTest
   function addCustomMenu() {
     // Add custom menu.
     $this->drupalGet('admin/build/menu/add');
-    $menu_name = substr(md5($this->randomName(16)), 0, 20);
+    $menu_name = substr(md5($this->randomName()), 0, MENU_MAX_MENU_NAME_LENGTH_UI);
     $title = $this->randomName(16);
     $edit = array (
       'menu_name' => $menu_name,