From 89c6d7a5010e49b361f833aeeb69ea9f28cd51e8 Mon Sep 17 00:00:00 2001 From: nathangray Date: Thu, 17 May 2018 09:18:29 -0600 Subject: [PATCH] * Mail - avoid javascript error blocking context menu from SpamTitan check when row data not found --- mail/js/app.js | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/mail/js/app.js b/mail/js/app.js index 4229104a70..f984b0e515 100644 --- a/mail/js/app.js +++ b/mail/js/app.js @@ -5609,10 +5609,15 @@ app.classes.mail = AppJS.extend( spamTitan_setActionTitle: function (_action, _sender) { var id = _sender[0].id != 'nm'? _sender[0].id:_sender[1].id; + var email = this.egw.lang('emails'); + var domain = this.egw.lang('domains'); var data = egw.dataGetUIDdata(id); - var fromaddress = data.data.fromaddress.match(/<([^\'\" <>]+)>$/); - var email = _sender.length>1? this.egw.lang('emails'):(fromaddress && fromaddress[1]) ?fromaddress[1]:data.data.fromaddress; - var domain = _sender.length>1? this.egw.lang('domains'):email.split('@')[1]; + if(_sender.length === 1 && data && data.data && data.data.fromaddress) + { + var fromaddress = data.data.fromaddress.match(/<([^\'\" <>]+)>$/); + email = (fromaddress && fromaddress[1]) ?fromaddress[1]:data.data.fromaddress; + domain = email.split('@')[1]; + } switch (_action.id) { case 'whitelist_email_add':