Ticket #6340: logout_url.diff

django/contrib/auth/views.py

@@ -8 +8 @@
 from django.contrib.auth.decorators import login_required
 from django.contrib.auth import REDIRECT_FIELD_NAME
 from django.utils.translation import ugettext as _
+from django.conf import settings
 
 def login(request, template_name='registration/login.html', redirect_field_name=REDIRECT_FIELD_NAME):
     "Displays the login form and handles the login action."
@@ -18 +19 @@
         if not errors:
             # Light security check -- make sure redirect_to isn't garbage.
             if not redirect_to or '//' in redirect_to or ' ' in redirect_to:
-                from django.conf import settings
                 redirect_to = settings.LOGIN_REDIRECT_URL
             from django.contrib.auth import login
             login(request, manipulator.get_user())
@@ -39 +39 @@
         'site_name': current_site.name,
     }, context_instance=RequestContext(request))
 
-def logout(request, next_page=None, template_name='registration/logged_out.html'):
+def logout(request, next_page=settings.LOGOUT_URL, template_name='registration/logged_out.html'):
     "Logs out the user and displays 'You are logged out' message."
     from django.contrib.auth import logout
     logout(request)
@@ -52 +52 @@
 def logout_then_login(request, login_url=None):
     "Logs out the user if he is logged in. Then redirects to the log-in page."
     if not login_url:
-        from django.conf import settings
         login_url = settings.LOGIN_URL
     return logout(request, login_url)
 
 def redirect_to_login(next, login_url=None, redirect_field_name=REDIRECT_FIELD_NAME):
     "Redirects the user to the login page, passing the given 'next' page"
     if not login_url:
-        from django.conf import settings
         login_url = settings.LOGIN_URL
     return HttpResponseRedirect('%s?%s=%s' % (login_url, redirect_field_name, next))