Ticket #5999: 00-admin-expired-session.diff

django/contrib/admin/sites.py

@@ -112 +112 @@
             return self.logout(request)
 
         if not self.has_permission(request):
-            return self.login(request)
+            return self.login(request, url)
 
 
         if url == '':
@@ -196 +196 @@
         from django.contrib.auth.views import logout
         return logout(request)
 
-    def login(self, request):
+    def login(self, request, url):
         """
         Displays the login form for the given HttpRequest.
         """
@@ -242 +242 @@
                         # overwrite request.POST with the saved post_data, and continue
                         request.POST = post_data
                         request.user = user
-                        return view_func(request, *args, **kwargs)
+                        return self.root(request, url)
                     else:
                         request.session.delete_test_cookie()
                         return http.HttpResponseRedirect(request.path)