diff options
| author | Russell Keith-Magee <russell@keith-magee.com> | 2009-11-04 02:01:54 +0000 |
|---|---|---|
| committer | Russell Keith-Magee <russell@keith-magee.com> | 2009-11-04 02:01:54 +0000 |
| commit | 9a38c1cdb2b04ab62d46ee3fcc709680ca5d74ed (patch) | |
| tree | 1063644181a5cb7c967080e57933f7984214f870 | |
| parent | a9c816c41b091888a99918ee4c4038eccd577d84 (diff) | |
[1.1.X] Fixed #11849 -- Corrected handling of use_tls in the SMTP mail handler. Thanks to aromano for the report.
Backport of r11714 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11715 bcc190cf-cafb-0310-a4f2-bffc1f526a37
| -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 c305699158..9eeb3429a6 100644 --- a/django/core/mail.py +++ b/django/core/mail.py @@ -112,7 +112,10 @@ class SMTPConnection(object): self.port = port or settings.EMAIL_PORT self.username = username or settings.EMAIL_HOST_USER self.password = password or settings.EMAIL_HOST_PASSWORD - self.use_tls = (use_tls is not None) and use_tls or settings.EMAIL_USE_TLS + if use_tls is None: + self.use_tls = settings.EMAIL_USE_TLS + else: + self.use_tls = use_tls self.fail_silently = fail_silently self.connection = None |