vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Prepare email message only if there is message (#3477)

Browse source
This commit is contained in:
Nabin Hait 2017-06-14 15:43:03 +05:30 • committed by GitHub
parent 93a4decbb8
commit f7b16fc56a
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
frappe/email/queue.py
View file

@ -429,11 +429,13 @@ where name=%s""", (unicode(e), email.name), auto_commit=auto_commit)
def prepare_message(email, recipient, recipients_list):
message = email.message
if not message:
return ""
if email.add_unsubscribe_link and email.reference_doctype: # is missing the check for unsubscribe message but will not add as there will be no unsubscribe url
unsubscribe_url = get_unsubcribed_url(email.reference_doctype, email.reference_name, recipient,
email.unsubscribe_method, email.unsubscribe_params)
if message:
message = message.replace("<!--unsubscribe url-->", quopri.encodestring(unsubscribe_url))
message = message.replace("<!--unsubscribe url-->", quopri.encodestring(unsubscribe_url))
if email.expose_recipients == "header":
pass