Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed #15322 -- Removed a redundant check in admin logins. Thanks to …

…melinath for the report.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15569 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 127725c56062659c284b18ca097db99be863227b 1 parent 670f4d9
Russell Keith-Magee freakboy3742 authored
Showing with 1 addition and 1 deletion.
  1. +1 −1  django/contrib/admin/forms.py
2  django/contrib/admin/forms.py
View
@@ -25,7 +25,7 @@ def clean(self):
if username and password:
self.user_cache = authenticate(username=username, password=password)
if self.user_cache is None:
- if username is not None and u'@' in username:
+ if u'@' in username:
# Mistakenly entered e-mail address instead of username? Look it up.
try:
user = User.objects.get(email=username)
Please sign in to comment.
Something went wrong with that request. Please try again.