From 7531f956aa542558d601a3d4f3039f4041793ec0 Mon Sep 17 00:00:00 2001 From: Dries Buytaert Date: Sun, 26 Aug 2007 08:00:49 +0000 Subject: - Patch #169627 by JirkaRybka: improved logging of mail problems. --- modules/user/user.module | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'modules') diff --git a/modules/user/user.module b/modules/user/user.module index 56200b84e..3c57fea1e 100644 --- a/modules/user/user.module +++ b/modules/user/user.module @@ -1331,15 +1331,10 @@ function user_pass_submit($form, &$form_state) { $account = $form_state['values']['account']; // Mail one time login URL and instructions using current language. - $mail_success = _user_mail_notify('password_reset', $account, $language); - if ($mail_success) { - watchdog('user', 'Password reset instructions mailed to %name at %email.', array('%name' => $account->name, '%email' => $account->mail)); - drupal_set_message(t('Further instructions have been sent to your e-mail address.')); - } - else { - watchdog('user', 'Error mailing password reset instructions to %name at %email.', array('%name' => $account->name, '%email' => $account->mail), WATCHDOG_ERROR); - drupal_set_message(t('Unable to send mail. Please contact the site admin.')); - } + _user_mail_notify('password_reset', $account, $language); + watchdog('user', 'Password reset instructions mailed to %name at %email.', array('%name' => $account->name, '%email' => $account->mail)); + drupal_set_message(t('Further instructions have been sent to your e-mail address.')); + $form_state['redirect'] = 'user'; return; } -- cgit v1.2.3