- Rollback of patch #147723: delete API. Talked to Steven and Gabor and we

  unanimously agreed to rollback the deletion API.  We all support the
  features this patch added, yet not its actual design and implementation.
  After some talk, we decided that it would be better for Drupal -- in the
  long term -- not to go with a solution that isn't 100%. We also recognize
  that in the short term, this patch would have been useful addition. So
  let's figure out how we can implement this properly in D7.

1 files changed, 3 insertions, 4 deletions

diff --git a/modules/menu/menu.module b/modules/menu/menu.module
index bc29cd928..6376cb111 100644
--- a/modules/menu/menu.module
+++ b/modules/menu/menu.module
@@ -464,7 +464,7 @@ function menu_item_delete_form(&$form_state, $mlid) {
   }
   $form['#item'] = $item;
 
-  return confirm_form($form, t('Are you sure you want to delete the custom menu item %item?', array('%item' => $item['link_title'])), 'admin/build/menu/'. $item['menu_name']);
+  return confirm_form($form, t('Are you sure you want to delete the custom menu item %item?', array('%item' => $item['link_title'])), 'admin/build/menu/'. $item['menu_name'], t('This action cannot be undone.'), t('Delete'));
 }
 
 /**
@@ -488,11 +488,10 @@ function menu_reset_item(&$form_state, $mlid) {
 
     $options = array(
       'description' => t('Any customizations will be lost. This action cannot be undone.'),
-      'yes' => t('Reset'),
-      'cancel' => 'admin/build/menu',
+      'yes' => t('Reset')
     );
 
-    return confirm_form($form, t('Are you sure you want to reset the item %item to its default values?', array('%item' => $item['link_title'])), 'admin/build/menu/navigation', $options);
+    return confirm_form($form, t('Are you sure you want to reset the item %item to its default values?', array('%item' => $item['link_title'])), 'admin/build/menu', $options);
   }
   else {
     drupal_not_found();