Ticket #12372: request-email.diff

django/contrib/auth/views.py

@@ -78 +78 @@
 # 4 views for password reset:
 # - password_reset sends the mail
 # - password_reset_done shows a success message for the above
-# - password_reset_confirm checks the link the user clicked and 
+# - password_reset_confirm checks the link the user clicked and
 #   prompts for a new password
 # - password_reset_complete shows a success message for the above
 
@@ -101 +101 @@
                 opts['email_template_name'] = email_template_name
                 if not Site._meta.installed:
                     opts['domain_override'] = RequestSite(request).domain
-            form.save(**opts)
+            form.save(request, **opts)
             return HttpResponseRedirect(post_reset_redirect)
     else:
         form = password_reset_form()

django/contrib/auth/forms.py

@@ -47 +47 @@
     username = forms.RegexField(label=_("Username"), max_length=30, regex=r'^\w+$',
         help_text = _("Required. 30 characters or fewer. Alphanumeric characters only (letters, digits and underscores)."),
         error_message = _("This value must contain only letters, numbers and underscores."))
-    
+
     class Meta:
         model = User
 
@@ -109 +109 @@
             raise forms.ValidationError(_("That e-mail address doesn't have an associated user account. Are you sure you've registered?"))
         return email
 
-    def save(self, domain_override=None, email_template_name='registration/password_reset_email.html',
+    def save(self, request=None, domain_override=None, email_template_name='registration/password_reset_email.html',
              use_https=False, token_generator=default_token_generator):
         """
         Generates a one-use only link for resetting password and sends to the user
@@ -131 +131 @@
                 'user': user,
                 'token': token_generator.make_token(user),
                 'protocol': use_https and 'https' or 'http',
+                'request': request,
             }
             send_mail(_("Password reset on %s") % site_name,
                 t.render(Context(c)), None, [user.email])