From 8966806ebf1fdd58551760ebe4d5945c8bb826fc Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Mon, 9 Feb 2015 14:13:32 +0530 Subject: [PATCH 1/2] [hotfix] validate email object before smtp send --- frappe/utils/email_lib/email_body.py | 2 -- frappe/utils/email_lib/smtp.py | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/utils/email_lib/email_body.py b/frappe/utils/email_lib/email_body.py index 21efc59001..a2f242b216 100644 --- a/frappe/utils/email_lib/email_body.py +++ b/frappe/utils/email_lib/email_body.py @@ -23,8 +23,6 @@ def get_email(recipients, sender='', msg='', subject='[No Subject]', for attach in (attachments or []): emailobj.add_attachment(**attach) - emailobj.validate() - return emailobj class EMail: diff --git a/frappe/utils/email_lib/smtp.py b/frappe/utils/email_lib/smtp.py index 543fd67702..688d08e2fb 100644 --- a/frappe/utils/email_lib/smtp.py +++ b/frappe/utils/email_lib/smtp.py @@ -15,6 +15,8 @@ def send(email, as_bulk=False): frappe.msgprint(_("Emails are muted")) return + email.validate() + try: smtpserver = SMTPServer() if hasattr(smtpserver, "always_use_login_id_as_sender") and \ From 280dd8be0084678e71b678214626851e2388e0f7 Mon Sep 17 00:00:00 2001 From: Pratik Vyas Date: Mon, 9 Feb 2015 14:50:32 +0600 Subject: [PATCH 2/2] bumped to version 4.11.3 --- frappe/__version__.py | 2 +- frappe/hooks.py | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frappe/__version__.py b/frappe/__version__.py index 77df5910b1..f2c314c153 100644 --- a/frappe/__version__.py +++ b/frappe/__version__.py @@ -1 +1 @@ -__version__ = "4.11.2" +__version__ = "4.11.3" diff --git a/frappe/hooks.py b/frappe/hooks.py index 32432aa770..b8f12896c6 100644 --- a/frappe/hooks.py +++ b/frappe/hooks.py @@ -3,7 +3,7 @@ app_title = "Frappe Framework" app_publisher = "Web Notes Technologies Pvt. Ltd." app_description = "Full Stack Web Application Framework in Python" app_icon = "assets/frappe/images/frappe.svg" -app_version = "4.11.2" +app_version = "4.11.3" app_color = "#3498db" app_email = "support@frappe.io" diff --git a/setup.py b/setup.py index fa19cd7acc..639cc6ef3b 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,7 @@ from setuptools import setup, find_packages import os -version = "4.11.2" +version = "4.11.3" with open("requirements.txt", "r") as f: install_requires = f.readlines()