Merge branch 'chrisjrn/better_mailer' of https://github.com/lca2017/symposion into chrisjrn/better_mailer

Conflicts: symposion/utils/mail.py
2016-09-18 12:40:45 +10:00 · 2016-09-18 12:40:45 +10:00 · 50ee66d200
commit 50ee66d200
parent 96683b6d7d b6b6c51cc1
1 changed files with 5 additions and 0 deletions
--- a/symposion/utils/mail.py
+++ b/symposion/utils/mail.py
@ -53,6 +53,11 @@ def __send_email__(template_prefix, to, kind, **kwargs):

    from_email = settings.DEFAULT_FROM_EMAIL

+    try:
+        bcc_email = settings.ENVELOPE_BCC_LIST
+    except AttributeError:
+        bcc_email = None
+
    try:
        bcc_email = settings.ENVELOPE_BCC_LIST
    except AttributeError: