From 7b3304d7d75c85d87edbc1829a9231cf6560bdc2 Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Thu, 6 Jun 2019 00:00:17 +0530 Subject: [PATCH] fix(error-report): Use error_report_email from config instead of hooks --- frappe/boot.py | 2 +- frappe/public/js/frappe/request.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/boot.py b/frappe/boot.py index 4acb7ee3c1..efa9ac2afe 100644 --- a/frappe/boot.py +++ b/frappe/boot.py @@ -72,7 +72,7 @@ def get_bootinfo(): bootinfo.lang = text_type(bootinfo.lang) bootinfo.versions = {k: v['version'] for k, v in get_versions().items()} - bootinfo.error_report_email = frappe.get_hooks("error_report_email") + bootinfo.error_report_email = frappe.conf.error_report_email bootinfo.calendars = sorted(frappe.get_hooks("calendars")) bootinfo.treeviews = frappe.get_hooks("treeviews") or [] bootinfo.lang_dict = get_lang_dict() diff --git a/frappe/public/js/frappe/request.js b/frappe/public/js/frappe/request.js index 9a3fe3699b..eab9b41ae3 100644 --- a/frappe/public/js/frappe/request.js +++ b/frappe/public/js/frappe/request.js @@ -431,7 +431,7 @@ frappe.request.report_error = function(xhr, request_opts) { } if (exc) { - var error_report_email = (frappe.boot.error_report_email || []).join(", "); + var error_report_email = frappe.boot.error_report_email; request_opts = frappe.request.cleanup_request_opts(request_opts);