Ticket #5999: alternative2.diff

django/contrib/admin/sites.py

@@ -113 +113 @@
             return self.logout(request)
 
         if not self.has_permission(request):
-            return self.login(request)
-
+            response = self.login(request)
+            if response:
+                return response
+            # with post data in session, continue
 
         if url == '':
             return self.index(request)
@@ -245 +247 @@
                         # overwrite request.POST with the saved post_data, and continue
                         request.POST = post_data
                         request.user = user
-                        return view_func(request, *args, **kwargs)
+                        return None
                     else:
                         request.session.delete_test_cookie()
                         return http.HttpResponseRedirect(request.path)