diff options
| author | Dries Buytaert <dries@buytaert.net> | 2006-05-12 18:14:50 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2006-05-12 18:14:50 +0000 |
| commit | 49b90a5d0460ccc4a2fd28001185204707a2c8b6 (patch) | |
| tree | 0fe96b804a74efaf142e24f3ef5423c9568cdc0f | |
| parent | 64eead44071c81d335aa686cb6c5d60cdbcf3502 (diff) | |
| download | brdo-49b90a5d0460ccc4a2fd28001185204707a2c8b6.tar.gz brdo-49b90a5d0460ccc4a2fd28001185204707a2c8b6.tar.bz2 | |
- Patch #57993 by Neil: clarified a status message.
| -rw-r--r-- | modules/user.module | 2 | ||||
| -rw-r--r-- | modules/user/user.module | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/modules/user.module b/modules/user.module index 89acdf372..28df629d7 100644 --- a/modules/user.module +++ b/modules/user.module @@ -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 diff --git a/modules/user/user.module b/modules/user/user.module index 89acdf372..28df629d7 100644 --- a/modules/user/user.module +++ b/modules/user/user.module @@ -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 |