From 3518d7bdf3ffe7ba4c3d1381ed9cb6ef17378140 Mon Sep 17 00:00:00 2001 From: Dries Buytaert Date: Wed, 22 Nov 2006 09:12:05 +0000 Subject: - Patch #99027 by greggles and webchick: help users request a new password when registration fails. --- modules/user/user.module | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'modules') diff --git a/modules/user/user.module b/modules/user/user.module index 9594729e4..ad2f5bae9 100644 --- a/modules/user/user.module +++ b/modules/user/user.module @@ -927,7 +927,7 @@ function user_login_validate($form_id, $form_values) { $user = user_authenticate($form_values['name'], trim($form_values['pass'])); if (!$user->uid) { - form_set_error('login', t('Sorry, unrecognized username or password.') .' '. l(t('Have you forgotten your password?'), 'user/password')); + form_set_error('login', t('Sorry, unrecognized username or password. Have you forgotten your password?', array('@password' => url('user/password')))); watchdog('user', t('Login attempt failed for %user.', array('%user' => $form_values['name']))); } } @@ -1361,7 +1361,7 @@ function _user_edit_validate($uid, &$edit) { form_set_error('mail', $error); } else if (db_num_rows(db_query("SELECT uid FROM {users} WHERE uid != %d AND LOWER(mail) = LOWER('%s')", $uid, $edit['mail'])) > 0) { - form_set_error('mail', t('The e-mail address %email is already taken.', array('%email' => $edit['mail']))); + form_set_error('mail', t('The e-mail address %email is already registered. Have you forgotten your password?', array('%email' => $edit['mail'], '@password' => url('user/password')))); } else if (drupal_is_denied('mail', $edit['mail'])) { form_set_error('mail', t('The e-mail address %email has been denied access.', array('%email' => $edit['mail']))); -- cgit v1.2.3