From 564d5565193224a1e2404c55bb4c63d5dcab8bcf Mon Sep 17 00:00:00 2001
From: Adrian Holovaty <adrian@holovaty.com>
Date: Sun, 23 Jul 2006 23:14:36 +0000
Subject: [PATCH] Fixed #2405 -- Fixed recursion error in auth.views.logout(),
caused by [3402]. Thanks, Jay Skabber
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3431 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
django/contrib/auth/views.py | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/django/contrib/auth/views.py b/django/contrib/auth/views.py
index 0ffa35bcff..428efe6239 100644
--- a/django/contrib/auth/views.py
+++ b/django/contrib/auth/views.py
@@ -34,9 +34,8 @@ def login(request, template_name='registration/login.html'):
def logout(request, next_page=None, template_name='registration/logged_out.html'):
"Logs out the user and displays 'You are logged out' message."
from django.contrib.auth import logout
- try:
- logout(request)
- except KeyError:
+ logout(request)
+ if next_page is None:
return render_to_response(template_name, {'title': _('Logged out')}, context_instance=RequestContext(request))
else:
# Redirect to this page until the session has been cleared.