Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

- Patch #57993 by Neil: clarified a status message.

5.x
Dries Buytaert 2006-05-12 18:14:50 +00:00
parent 64eead4407
commit 49b90a5d04
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/user.module
View File

@ -904,7 +904,7 @@ 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 been blocked.', array('%name' => theme('placeholder', $form_values['name']))));
form_set_error('login', t('The username %name has not been activated or is blocked.', array('%name' => theme('placeholder', $form_values['name']))));
}
else if (drupal_is_denied('user', $form_values['name'])) {
// denied by access controls

2
modules/user/user.module
View File

@ -904,7 +904,7 @@ 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 been blocked.', array('%name' => theme('placeholder', $form_values['name']))));
form_set_error('login', t('The username %name has not been activated or is blocked.', array('%name' => theme('placeholder', $form_values['name']))));
}
else if (drupal_is_denied('user', $form_values['name'])) {
// denied by access controls