diff --git modules/user/user.module modules/user/user.module index b748478..cedc2db 100644 --- modules/user/user.module +++ modules/user/user.module @@ -2118,15 +2118,8 @@ function _user_cancel($edit, $account, $method) { if (!empty($edit['user_cancel_notify'])) { _user_mail_notify('status_canceled', $account); } - db_delete('users') - ->condition('uid', $account->uid) - ->execute(); - db_delete('users_roles') - ->condition('uid', $account->uid) - ->execute(); - db_delete('authmap') - ->condition('uid', $account->uid) - ->execute(); + // Perform database deletes. + _user_cancel_delete(); drupal_set_message(t('%name has been deleted.', array('%name' => $account->name))); watchdog('user', 'Deleted user: %name %email.', array('%name' => $account->name, '%email' => '<' . $account->mail . '>'), WATCHDOG_NOTICE); break; @@ -2146,6 +2139,18 @@ function _user_cancel($edit, $account, $method) { } /** + * Perform database deletions for user_cancel_delete method. + */ +function _user_cancel_delete() { + db_delete('users') + ->condition('uid', $account->uid) + ->execute(); + db_delete('users_roles') + ->condition('uid', $account->uid) + ->execute(); +} + +/** * Page callback wrapper for user_view(). */ function user_view_page($uid) {