commit fdd3edad2d4d5df7941d2f14a7fec1398d9e5070
Author: Daniel Pepin <dpepin@digitalbungalow.com>
Date:   Fri May 10 09:20:21 2013 -0400

    Updated D7 patch from suggestions in the D8 patch.

diff --git a/modules/user/user.module b/modules/user/user.module
index ee660b5..7512a02 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -2450,7 +2450,7 @@ function _user_cancel($edit, $account, $method) {
     case 'user_cancel_delete':
       if (!empty($edit['user_cancel_confirm'])) {
         _user_mail_notify('cancel_confirm', $account);
-        drupal_set_message(t('A confirmation request to cancel %name account has been sent to %email address.',array('%name'=>$account->name,'%email'=>$account->mail)));
+        drupal_set_message(t('Cancellation request sent to %email.',array('%email' => $account->mail)));
         watchdog('user', 'Sent account cancellation request to %name %email.', array('%name' => $account->name, '%email' => '<' . $account->mail . '>'), WATCHDOG_NOTICE);
       }
       else{
diff --git a/modules/user/user.test b/modules/user/user.test
index 65c0096..fef450d 100644
--- a/modules/user/user.test
+++ b/modules/user/user.test
@@ -909,8 +909,7 @@ class UserCancelTestCase extends DrupalWebTestCase {
     variable_set('user_mail_status_canceled_notify', TRUE);
 
     // Create administrative user.
-    $admin_user = $this->drupalCreateUser(array('administer users'));
-    $this->drupalLogin($admin_user);
+    $this->drupalLogin($this->drupalCreateUser(array('administer users')));
 
     // Create some users.
     $users = array();
@@ -926,28 +925,23 @@ class UserCancelTestCase extends DrupalWebTestCase {
       $edit['accounts[' . $uid . ']'] = TRUE;
     }
     $this->drupalPost('admin/people', $edit, t('Update'));
-    $this->assertText(t('Are you sure you want to cancel these user accounts?'), 'Confirmation form to cancel accounts displayed.');
-    $this->assertText(t('When cancelling these accounts'), 'Allows to select account cancellation method.');
-    $this->assertText(t('Require e-mail confirmation to cancel account.'), 'Allows to send confirmation mail.');
-    $this->assertText(t('Notify user when account is canceled.'), 'Allows to send notification mail.');
 
     // Send confirmation e-emails to users.
     $edit['user_cancel_confirm'] = TRUE;
 
     // Confirm deletion.
     $this->drupalPost(NULL, $edit, t('Cancel accounts'));
-    $status = TRUE;
+
     // Make sure we send a user cancel confirmation e-mail.
-    $this->assertMail('id', 'user_cancel_confirm', "User cancel confirmation e-mail has been sent.");
+    $this->assertMail('id', 'user_cancel_confirm', 'User cancel confirmation e-mail has been sent.');
     foreach ($users as $account) {
-      $status = $status && (strpos($this->content, t('A confirmation request to cancel %name account has been sent to %mail address.', array('%name' => $account->name, '%mail' => $account->mail))) !== FALSE);
+      $this->assertRaw(t('Cancellation request sent to %email.', array('%email' => $account->mail)));
       $user = user_load($account->uid, TRUE);
-      // Account exists.
-      $status = $status && $user;
-      // Make sure account is still enabled.
-      $status = $status && $user->status;
+      // Check that account exists.
+      $this->assertTrue($user->uid, 'User account exists.');
+      // Check that account is still enabled.
+      $this->assertTrue($user->status, 'User account is enabled.');
     }
-    $this->assertTrue($status, 'Users are found in the database.');
   }
 
 }