summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2007-04-06 14:27:22 +0000
committerDries Buytaert <dries@buytaert.net>2007-04-06 14:27:22 +0000
commitec3c0716aa39acc91fe75ce592ce77bdfdd2eb56 (patch)
tree5ba3c357f33c15eb094e6294373f669a3419287a
parenta871b96a489dc679110455b51a78696c9b59cf42 (diff)
downloadbrdo-ec3c0716aa39acc91fe75ce592ce77bdfdd2eb56.tar.gz
brdo-ec3c0716aa39acc91fe75ce592ce77bdfdd2eb56.tar.bz2
- Patch #133865 by alexis: incorrect form_set_error() calls.
-rw-r--r--modules/user/user.module6
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/user/user.module b/modules/user/user.module
index c3dbc1842..4e0c134ea 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -1049,17 +1049,17 @@ function user_login_validate($form_id, $form_values) {
if ($form_values['name']) {
if (user_is_blocked($form_values['name'])) {
// blocked in user administration
- form_set_error('login', t('The username %name has not been activated or is blocked.', array('%name' => $form_values['name'])));
+ form_set_error('name', t('The username %name has not been activated or is blocked.', array('%name' => $form_values['name'])));
}
else if (drupal_is_denied('user', $form_values['name'])) {
// denied by access controls
- form_set_error('login', t('The name %name is a reserved username.', array('%name' => $form_values['name'])));
+ form_set_error('name', t('The name %name is a reserved username.', array('%name' => $form_values['name'])));
}
else if ($form_values['pass']) {
$user = user_authenticate($form_values['name'], trim($form_values['pass']));
if (!$user->uid) {
- form_set_error('login', t('Sorry, unrecognized username or password. <a href="@password">Have you forgotten your password?</a>', array('@password' => url('user/password'))));
+ form_set_error('name', t('Sorry, unrecognized username or password. <a href="@password">Have you forgotten your password?</a>', array('@password' => url('user/password'))));
watchdog('user', t('Login attempt failed for %user.', array('%user' => $form_values['name'])));
}
}