summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJannis Leidel <jannis@leidel.info>2011-01-10 08:15:52 +0000
committerJannis Leidel <jannis@leidel.info>2011-01-10 08:15:52 +0000
commit937548bba45c6933dab774b59fded8f0055e8937 (patch)
tree2dc6388ecd17863fb3937de083ff0be0e2ab5390
parent730769d1af383c513a104fab29bdb08dcca769f0 (diff)
Fixed #15043 -- Updated the login function to send the user_logged_in signal after the user's session got recycled instead of before. Thanks, Rob Hudson.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15168 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/contrib/auth/__init__.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/django/contrib/auth/__init__.py b/django/contrib/auth/__init__.py
index 633baa5265..7fb6370c32 100644
--- a/django/contrib/auth/__init__.py
+++ b/django/contrib/auth/__init__.py
@@ -70,8 +70,6 @@ def login(request, user):
if user is None:
user = request.user
# TODO: It would be nice to support different login methods, like signed cookies.
- user_logged_in.send(sender=user.__class__, request=request, user=user)
-
if SESSION_KEY in request.session:
if request.session[SESSION_KEY] != user.id:
# To avoid reusing another user's session, create a new, empty
@@ -84,6 +82,7 @@ def login(request, user):
request.session[BACKEND_SESSION_KEY] = user.backend
if hasattr(request, 'user'):
request.user = user
+ user_logged_in.send(sender=user.__class__, request=request, user=user)
def logout(request):
"""