Ticket #17216: views.py.patch

django/contrib/auth/views.py

@@ -30 +30 @@
     """
     redirect_to = request.REQUEST.get(redirect_field_name, '')
 
-    if request.method == "POST":
-        form = authentication_form(data=request.POST)
-        if form.is_valid():
-            netloc = urlparse.urlparse(redirect_to)[1]
+    form = authentication_form(request, data=request.POST or None)
 
-            # Use default setting if redirect_to is empty
-            if not redirect_to:
-                redirect_to = settings.LOGIN_REDIRECT_URL
-
-            # Security check -- don't allow redirection to a different
-            # host.
-            elif netloc and netloc != request.get_host():
-                redirect_to = settings.LOGIN_REDIRECT_URL
+    if form.is_valid():
+        netloc = urlparse.urlparse(redirect_to)[1]
 
-            # Okay, security checks complete. Log the user in.
-            auth_login(request, form.get_user())
+        # Use default setting if redirect_to is empty
+        if not redirect_to:
+            redirect_to = settings.LOGIN_REDIRECT_URL
+
+        # Security check -- don't allow redirection to a different
+        # host.
+        elif netloc and netloc != request.get_host():
+            redirect_to = settings.LOGIN_REDIRECT_URL
 
-            if request.session.test_cookie_worked():
-                request.session.delete_test_cookie()
+        # Okay, security checks complete. Log the user in.
+        auth_login(request, form.get_user())
 
-            return HttpResponseRedirect(redirect_to)
-    else:
-        form = authentication_form(request)
+        if request.session.test_cookie_worked():
+            request.session.delete_test_cookie()
+
+        return HttpResponseRedirect(redirect_to)
 
     request.session.set_test_cookie()
 
@@ -68 +66 @@
     return render_to_response(template_name, context,
                               context_instance=RequestContext(request, current_app=current_app))
 
-
 def logout(request, next_page=None,
            template_name='registration/logged_out.html',
            redirect_field_name=REDIRECT_FIELD_NAME,