From f7b16fc56ab69849a5a73a0ee7e6edf296a5c983 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 14 Jun 2017 15:43:03 +0530 Subject: [PATCH] Prepare email message only if there is message (#3477) --- frappe/email/queue.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/frappe/email/queue.py b/frappe/email/queue.py index 23a549d6e2..2fe1e34486 100755 --- a/frappe/email/queue.py +++ b/frappe/email/queue.py @@ -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("", quopri.encodestring(unsubscribe_url)) + message = message.replace("", quopri.encodestring(unsubscribe_url)) if email.expose_recipients == "header": pass