Ticket #11400: r11798.diff

django/contrib/auth/models.py

@@ -265 +265 @@
             m.delete()
         return messages
 
-    def email_user(self, subject, message, from_email=None):
+    def email_user(self, subject, message, from_email=None, **kwargs):
         "Sends an e-mail to this User."
         from django.core.mail import send_mail
-        send_mail(subject, message, from_email, [self.email])
+        send_mail(subject, message, from_email, [self.email], **kwargs)
 
     def get_profile(self):
         """

docs/topics/auth.txt

@@ -233 +233 @@
         Returns a list of :class:`~django.contrib.auth.models.Message` objects
         in the user's queue and deletes the messages from the queue.
 
-    .. method:: models.User.email_user(subject, message, from_email=None)
+    .. method:: models.User.email_user(subject, message, from_email=None, **kwargs)
 
         Sends an e-mail to the user. If
         :attr:`~django.contrib.auth.models.User.from_email` is ``None``, Django
-        uses the :setting:`DEFAULT_FROM_EMAIL`.
+        uses the :setting:`DEFAULT_FROM_EMAIL`. Any ``**kwargs`` will be passed
+        directly to :meth:`~django.core.mail.send_mail()`.
 
     .. method:: models.User.get_profile()