Author: adrian
Date: 2006-07-23 18:14:36 -0500 (Sun, 23 Jul 2006)
New Revision: 3431
Modified:
django/trunk/django/contrib/auth/views.py
Log:
Fixed #2405 -- Fixed recursion error in auth.views.logout(), caused by [3402].
Thanks, Jay Skabber
Modified: django/trunk/django/contrib/auth/views.py
===================================================================
--- django/trunk/django/contrib/auth/views.py 2006-07-23 04:05:30 UTC (rev
3430)
+++ django/trunk/django/contrib/auth/views.py 2006-07-23 23:14:36 UTC (rev
3431)
@@ -34,9 +34,8 @@
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.
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/django-updates
-~----------~----~----~----~------~----~------~--~---
