From d237c402e1387c13d8c6b8b4feca98eae81e4e6f Mon Sep 17 00:00:00 2001
From: Jorran de Wit <jorrandewit@outlook.com>
Date: Thu, 9 Nov 2017 09:49:47 +0100
Subject: [PATCH] Make bcc optional in mail app
---
mails/forms.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/mails/forms.py b/mails/forms.py
index fd1feb9cb..a7a8b241a 100644
--- a/mails/forms.py
+++ b/mails/forms.py
@@ -62,7 +62,7 @@ class EmailTemplateForm(forms.Form):
# Get recipients list. Try to send through BCC to prevent privacy issues!
bcc_list = []
- if self.mail_data.get('bcc_to') and self.object:
+ if self.mail_data.get('bcc_to', False) and self.object:
if re.match("[^@]+@[^@]+\.[^@]+", self.mail_data.get('bcc_to')):
bcc_list = [self.mail_data.get('bcc_to')]
else:
@@ -74,7 +74,7 @@ class EmailTemplateForm(forms.Form):
bcc_list = [bcc_to]
else:
bcc_list = bcc_to
- elif re.match("[^@]+@[^@]+\.[^@]+", self.mail_data.get('bcc_to')):
+ elif re.match("[^@]+@[^@]+\.[^@]+", self.mail_data.get('bcc_to', '')):
bcc_list = [self.mail_data.get('bcc_to')]
if self.cleaned_data.get('extra_recipient') and self.recipient:
--
GitLab