Ticket #5298: fix-extra_context.diff

django/contrib/auth/views.py

@@ -9 +9 @@
 from django.contrib.auth import REDIRECT_FIELD_NAME
 from django.utils.translation import ugettext as _
 
-def login(request, template_name='registration/login.html'):
+def login(request, template_name='registration/login.html', extra_context={}):
     "Displays the login form and handles the login action."
     manipulator = AuthenticationForm(request)
     redirect_to = request.REQUEST.get(REDIRECT_FIELD_NAME, '')
@@ -37 +37 @@
         'form': oldforms.FormWrapper(manipulator, request.POST, errors),
         REDIRECT_FIELD_NAME: redirect_to,
         'site_name': current_site.name,
-    }, context_instance=RequestContext(request))
+    }, context_instance=RequestContext(request, extra_context))
 
-def logout(request, next_page=None, template_name='registration/logged_out.html'):
+def logout(request, next_page=None, template_name='registration/logged_out.html', extra_context={}):
     "Logs out the user and displays 'You are logged out' message."
     from django.contrib.auth import logout
     logout(request)
     if next_page is None:
-        return render_to_response(template_name, {'title': _('Logged out')}, context_instance=RequestContext(request))
+        return render_to_response(template_name, {'title': _('Logged out')}, context_instance=RequestContext(request, extra_context))
     else:
         # Redirect to this page until the session has been cleared.
         return HttpResponseRedirect(next_page or request.path)
@@ -64 +64 @@
     return HttpResponseRedirect('%s?%s=%s' % (login_url, REDIRECT_FIELD_NAME, next))
 
 def password_reset(request, is_admin_site=False, template_name='registration/password_reset_form.html',
-        email_template_name='registration/password_reset_email.html'):
+        email_template_name='registration/password_reset_email.html', extra_context={}):
     new_data, errors = {}, {}
     form = PasswordResetForm()
     if request.POST:
@@ -77 +77 @@
                 form.save(email_template_name=email_template_name)
             return HttpResponseRedirect('%sdone/' % request.path)
     return render_to_response(template_name, {'form': oldforms.FormWrapper(form, new_data, errors)},
-        context_instance=RequestContext(request))
+        context_instance=RequestContext(request, extra_context))
 
-def password_reset_done(request, template_name='registration/password_reset_done.html'):
-    return render_to_response(template_name, context_instance=RequestContext(request))
+def password_reset_done(request, template_name='registration/password_reset_done.html', extra_context={}):
+    return render_to_response(template_name, context_instance=RequestContext(request, extra_context))
 
-def password_change(request, template_name='registration/password_change_form.html'):
+def password_change(request, template_name='registration/password_change_form.html', extra_context={}):
     new_data, errors = {}, {}
     form = PasswordChangeForm(request.user)
     if request.POST:
@@ -92 +92 @@
             form.save(new_data)
             return HttpResponseRedirect('%sdone/' % request.path)
     return render_to_response(template_name, {'form': oldforms.FormWrapper(form, new_data, errors)},
-        context_instance=RequestContext(request))
+        context_instance=RequestContext(request, extra_context))
 password_change = login_required(password_change)
 
-def password_change_done(request, template_name='registration/password_change_done.html'):
-    return render_to_response(template_name, context_instance=RequestContext(request))
+def password_change_done(request, template_name='registration/password_change_done.html', extra_context={}):
+    return render_to_response(template_name, context_instance=RequestContext(request, extra_context))