diff options
| author | Joseph Kocherhans <joseph@jkocherhans.com> | 2006-05-16 20:39:14 +0000 |
|---|---|---|
| committer | Joseph Kocherhans <joseph@jkocherhans.com> | 2006-05-16 20:39:14 +0000 |
| commit | e1184016a29b90694e3624d646b35b9d4aa4756e (patch) | |
| tree | f15b0c5f1ccd0f22b132b97403304263da579fb9 /django/core/mail.py | |
| parent | 93937ed38a828e0f252fb25614516593ec7b9ab0 (diff) | |
multi-auth: Merged to [2919]
git-svn-id: http://code.djangoproject.com/svn/django/branches/multi-auth@2921 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/core/mail.py')
| -rw-r--r-- | django/core/mail.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/django/core/mail.py b/django/core/mail.py index 3baf191b5c..415cb6e8fc 100644 --- a/django/core/mail.py +++ b/django/core/mail.py @@ -2,6 +2,7 @@ from django.conf import settings from email.MIMEText import MIMEText +from email.Header import Header import smtplib class BadHeaderError(ValueError): @@ -12,6 +13,8 @@ class SafeMIMEText(MIMEText): "Forbids multi-line headers, to prevent header injection." if '\n' in val or '\r' in val: raise BadHeaderError, "Header values can't contain newlines (got %r for header %r)" % (val, name) + if name == "Subject": + val = Header(val, settings.DEFAULT_CHARSET) MIMEText.__setitem__(self, name, val) def send_mail(subject, message, from_email, recipient_list, fail_silently=False, auth_user=settings.EMAIL_HOST_USER, auth_password=settings.EMAIL_HOST_PASSWORD): @@ -42,7 +45,7 @@ def send_mass_mail(datatuple, fail_silently=False, auth_user=settings.EMAIL_HOST if not recipient_list: continue from_email = from_email or settings.DEFAULT_FROM_EMAIL - msg = SafeMIMEText(message) + msg = SafeMIMEText(message, 'plain', settings.DEFAULT_CHARSET) msg['Subject'] = subject msg['From'] = from_email msg['To'] = ', '.join(recipient_list) |