From 71c491972eecae8783cf46e69fac7e5f9f83fc59 Mon Sep 17 00:00:00 2001 From: SusanTan Date: Sat, 10 Aug 2013 01:13:41 -0700 Subject: Fixed #11400 -- Passed kwargs from AbstractUser.email_user() to send_mail() Thanks Jug_ for suggestion, john_scott for the initial patch, and Tim Graham for code review. --- docs/ref/contrib/auth.txt | 7 ++++++- docs/releases/1.7.txt | 4 ++++ 2 files changed, 10 insertions(+), 1 deletion(-) (limited to 'docs') diff --git a/docs/ref/contrib/auth.txt b/docs/ref/contrib/auth.txt index 4fe87e9872..ba4c9425a5 100644 --- a/docs/ref/contrib/auth.txt +++ b/docs/ref/contrib/auth.txt @@ -215,11 +215,16 @@ Methods (the Django app label). If the user is inactive, this method will always return ``False``. - .. method:: email_user(subject, message, from_email=None) + .. method:: email_user(subject, message, from_email=None, **kwargs) Sends an email to the user. If ``from_email`` is ``None``, Django uses the :setting:`DEFAULT_FROM_EMAIL`. + .. versionchanged:: 1.7 + + Any ``**kwargs`` are passed to the underlying + :meth:`~django.core.mail.send_mail()` call. + Manager methods --------------- diff --git a/docs/releases/1.7.txt b/docs/releases/1.7.txt index 9fe8fc89df..f4bbd058d6 100644 --- a/docs/releases/1.7.txt +++ b/docs/releases/1.7.txt @@ -152,6 +152,10 @@ Minor features Each radio button or checkbox includes an ``id_for_label`` attribute to output the element's ID. +* Any ``**kwargs`` passed to + :meth:`~django.contrib.auth.models.User.email_user()` are passed to the + underlying :meth:`~django.core.mail.send_mail()` call. + Backwards incompatible changes in 1.7 ===================================== -- cgit v1.3