Ticket #2405: logout.diff

trunk/django/contrib/auth/views.py

@@ -34 +34 @@
 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 == 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.