mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-27 23:56:08 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #7220 -- Allowed AbstractBaseUser.last_login to be null.

Browse Source 
Thanks veena for the suggestion and Simon Charette and Kévin Etienne for reviews.
This commit is contained in:
Tim Graham
2014-07-29 08:56:00 -04:00
parent 1a31d9ef91
commit a2479f46f3
6 changed files with 55 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
django/contrib/auth/tokens.py
View File

@@ -56,7 +56,7 @@ class PasswordResetTokenGenerator(object):
key_salt = "django.contrib.auth.tokens.PasswordResetTokenGenerator"
# Ensure results are consistent across DB backends
login_timestamp = user.last_login.replace(microsecond=0, tzinfo=None)
login_timestamp = '' if user.last_login is None else user.last_login.replace(microsecond=0, tzinfo=None)
value = (six.text_type(user.pk) + user.password +
six.text_type(login_timestamp) + six.text_type(timestamp))