diff options
| -rw-r--r-- | django/contrib/auth/forms.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/django/contrib/auth/forms.py b/django/contrib/auth/forms.py index 6c0c8abe97..800c14375b 100644 --- a/django/contrib/auth/forms.py +++ b/django/contrib/auth/forms.py @@ -36,9 +36,13 @@ class AuthenticationForm(forms.Manipulator): raise validators.ValidationError, _("Please enter a correct username and password. Note that both fields are case-sensitive.") def isValidPasswordForUser(self, field_data, all_data): - if self.user_cache is not None and not self.user_cache.check_password(field_data): + if self.user_cache is None: + return + if not self.user_cache.check_password(field_data): self.user_cache = None raise validators.ValidationError, _("Please enter a correct username and password. Note that both fields are case-sensitive.") + elif not self.user_cache.is_active: + raise validators.ValidationError, _("This account is inactive.") def get_user_id(self): if self.user_cache: |