Index: og_menu.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/og_menu/og_menu.module,v
retrieving revision 1.4
diff -u -p -r1.4 og_menu.module
--- og_menu.module	22 Jul 2010 16:38:35 -0000	1.4
+++ og_menu.module	22 Aug 2010 14:56:14 -0000
@@ -380,18 +380,11 @@ function og_menu_edit_menu_form(&$form_s
   $form['#submit'][] = 'menu_edit_menu_submit';
   $form['#submit'][] = 'og_menu_edit_menu_form_submit';
   $form['#submit'][] = 'og_menu_edit_menu_form_submit_redirect';
-  $form['#validate'][] = 'og_menu_edit_menu_validate';
   $form['#validate'][] = 'menu_edit_menu_validate';
   $form['delete']['#submit'][] = 'og_menu_delete_menu_form_submit';
   return $form;
 }
 
-function og_menu_edit_menu_validate($form, &$form_state) {
-  if (preg_match('/^menu-/', $form_state['values']['menu_name'])) {
-    form_set_error('menu_name', t('The menu name cannot begin with "menu-".'));
-  }
-}
-
 function og_menu_edit_menu_form_submit_redirect($form, &$form_state) {
   $node = menu_get_object('node', 1);
   if ($form['#insert']) {
@@ -408,7 +401,7 @@ function og_menu_edit_menu_form_submit($
   $menu_name = $form_state['values']['menu_name'];
   $gid = $form_state['values']['og_menu_gid'];
   // Add 'menu-' if this is a new menu
-  if (strpos($menu_name, 'menu-') === FALSE) {
+  if ($form['#insert']) {
     $menu_name = 'menu-'. $menu_name;
   }
   og_menu_update_menu($menu_name, $gid);