diff --git a/frappe/__init__.py b/frappe/__init__.py index 0aae4408c5..91bae82696 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -24,7 +24,7 @@ if sys.version[0] == '2': reload(sys) sys.setdefaultencoding("utf-8") -__version__ = '11.1.15' +__version__ = '11.1.16' __title__ = "Frappe Framework" local = Local() diff --git a/frappe/utils/__init__.py b/frappe/utils/__init__.py index 9756ddc741..78e6b56fe2 100644 --- a/frappe/utils/__init__.py +++ b/frappe/utils/__init__.py @@ -74,6 +74,12 @@ def extract_email_id(email): email_id = email_id.decode("utf-8", "ignore") return email_id +def validate_email_add(email_str, throw=False): + """ + validate_email_add will be renamed to the validate_email_address in v12 + """ + return validate_email_address(email_str, throw=False) + def validate_email_address(email_str, throw=False): """Validates the email string""" email = email_str = (email_str or "").strip() @@ -654,4 +660,4 @@ def get_safe_filters(filters): # filters are not passed, not json pass - return filters \ No newline at end of file + return filters diff --git a/frappe/utils/response.py b/frappe/utils/response.py index 5f4ced5405..8412ec6271 100644 --- a/frappe/utils/response.py +++ b/frappe/utils/response.py @@ -105,7 +105,8 @@ def make_logs(response = None): if frappe.error_log: response['exc'] = json.dumps([frappe.utils.cstr(d["exc"]) for d in frappe.local.error_log]) - response['locals'] = json.dumps([frappe.utils.cstr(d["locals"]) for d in frappe.local.error_log]) + if frappe.conf.developer_mode: + response['locals'] = json.dumps([frappe.utils.cstr(d["locals"]) for d in frappe.local.error_log]) if frappe.local.message_log: response['_server_messages'] = json.dumps([frappe.utils.cstr(d) for