From a9ee1d4e28f4e6509dd910982b5504bc6a3554cc Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Sat, 23 Aug 2008 14:12:58 +0000 Subject: Fixed #7776: Ensured that the test cookie is always deleted once a login has succeeded. Thanks for the report and fix, Mnewman. git-svn-id: http://code.djangoproject.com/svn/django/trunk@8484 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/contrib/admin/sites.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'django') diff --git a/django/contrib/admin/sites.py b/django/contrib/admin/sites.py index 0407d3d47e..81e43a19cc 100644 --- a/django/contrib/admin/sites.py +++ b/django/contrib/admin/sites.py @@ -274,13 +274,13 @@ class AdminSite(object): login(request, user) if request.POST.has_key('post_data'): post_data = _decode_post_data(request.POST['post_data']) + request.session.delete_test_cookie() if post_data and not post_data.has_key(LOGIN_FORM_KEY): # overwrite request.POST with the saved post_data, and continue request.POST = post_data request.user = user return self.root(request, request.path.split(self.root_path)[-1]) else: - request.session.delete_test_cookie() return http.HttpResponseRedirect(request.get_full_path()) else: return self.display_login_form(request, ERROR_MESSAGE) -- cgit v1.3