#153781: Convert all remaining confirm_forms() to deletion api.

1 files changed, 8 insertions, 9 deletions

diff --git a/modules/user/user.module b/modules/user/user.module
index c790bee9b..9d90d30ad 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -1607,11 +1607,12 @@ function user_edit($form_state, $category = 'account') {
 }
 
 function user_confirm_delete($name, $uid) {
+  $options = array('description' => t('All submissions made by this user will be attributed to the anonymous account. This action cannot be undone.'));
+
   return confirm_form(array(),
     t('Are you sure you want to delete the account %name?', array('%name' => $name)),
     'user/'. $uid,
-    t('All submissions made by this user will be attributed to the anonymous account. This action cannot be undone.'),
-    t('Delete'), t('Cancel'));
+    $options);
 }
 
 /**
@@ -1663,7 +1664,7 @@ function user_view($account) {
   // Retrieve all profile fields and store data in content element.
   $account->content = user_build_content($account);
   drupal_set_title(check_plain($account->name));
-  /** 
+  /**
    * To theme user profiles, copy modules/user/user_profile.tpl.php
    * to your theme directory, and edit it as instructed in that file's comments.
    */
@@ -1844,10 +1845,7 @@ function user_admin_access_delete_confirm($aid = 0) {
   $form['aid'] = array('#type' => 'hidden', '#value' => $aid);
   $output = confirm_form($form,
                   t('Are you sure you want to delete the @type rule for %rule?', array('@type' => $access_types[$edit->type], '%rule' => $edit->mask)),
-                  'admin/user/rules',
-                  t('This action cannot be undone.'),
-                  t('Delete'),
-                  t('Cancel'));
+                  'admin/user/rules');
   return $output;
 }
 
@@ -2448,10 +2446,11 @@ function user_multiple_delete_confirm(&$form_state) {
   }
   $form['operation'] = array('#type' => 'hidden', '#value' => 'delete');
 
+  $options = array('yes' => t('Delete all'));
+
   return confirm_form($form,
                       t('Are you sure you want to delete these users?'),
-                      'admin/user/user', t('This action cannot be undone.'),
-                      t('Delete all'), t('Cancel'));
+                      'admin/user/user', $options);
 }
 
 function user_multiple_delete_confirm_submit($form, &$form_state) {