- 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, 1 insertions, 6 deletions

diff --git a/modules/search/search.module b/modules/search/search.module
index 1ae52e456..d19b6cd4b 100644
--- a/modules/search/search.module
+++ b/modules/search/search.module
@@ -262,13 +262,8 @@ function search_admin_settings() {
  * Menu callback: confirm wiping of the index.
  */
 function search_wipe_confirm() {
-  $options = array(
-    'description' => t(' The search index is not cleared but systematically updated to reflect the new settings. Searching will continue to work but new content won\'t be indexed until all existing content has been re-indexed. This action cannot be undone.'),
-    'yes' => t('Re-index site')
-  );
-
   return confirm_form(array(), t('Are you sure you want to re-index the site?'),
-                  'admin/settings/search', $options);
+                  'admin/settings/search', t(' The search index is not cleared but systematically updated to reflect the new settings. Searching will continue to work but new content won\'t be indexed until all existing content has been re-indexed. This action cannot be undone.'), t('Re-index site'), t('Cancel'));
 }
 
 /**