Ticket #7364: 7364-admin_login_cache-8345.diff

django/contrib/admin/views/decorators.py

@@ -12 +12 @@
 from django.shortcuts import render_to_response
 from django.utils.translation import ugettext_lazy, ugettext as _
 from django.utils.hashcompat import md5_constructor
+from django.views.decorators.cache import never_cache
 
 ERROR_MESSAGE = ugettext_lazy("Please enter a correct username and password. Note that both fields are case-sensitive.")
 LOGIN_FORM_KEY = 'this_is_the_login_form'
@@ -32 +33 @@
         'post_data': post_data,
         'error_message': error_message
     }, context_instance=template.RequestContext(request))
+_display_login_form = never_cache(_display_login_form)
 
 def _encode_post_data(post_data):
     pickled = pickle.dumps(post_data)

django/contrib/auth/views.py

@@ -13 +13 @@
 from django.utils.http import urlquote, base36_to_int
 from django.utils.html import escape
 from django.utils.translation import ugettext as _
+from django.views.decorators.cache import never_cache
 from django.contrib.auth.models import User
 import re
 
@@ -43 +44 @@
         redirect_field_name: redirect_to,
         'site_name': current_site.name,
     }, context_instance=RequestContext(request))
+login = never_cache(login)
 
 def logout(request, next_page=None, template_name='registration/logged_out.html'):
     "Logs out the user and displays 'You are logged out' message."