From e633443177136bec0e3ff61c88970118bbbe0499 Mon Sep 17 00:00:00 2001 From: Eileen McNaughton Date: Fri, 1 Oct 2021 08:20:24 +1300 Subject: [PATCH] dev/core#2866 Ignore preferred mail format - send to both --- CRM/Contact/Form/Task/EmailTrait.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/CRM/Contact/Form/Task/EmailTrait.php b/CRM/Contact/Form/Task/EmailTrait.php index da674268c3..c4d17c60c5 100644 --- a/CRM/Contact/Form/Task/EmailTrait.php +++ b/CRM/Contact/Form/Task/EmailTrait.php @@ -859,13 +859,11 @@ trait CRM_Contact_Form_Task_EmailTrait { } $tokenSubject = $subject; - $tokenText = in_array($values['preferred_mail_format'], ['Both', 'Text'], TRUE) ? $text : ''; - $tokenHtml = in_array($values['preferred_mail_format'], ['Both', 'HTML'], TRUE) ? $html : ''; $renderedTemplate = CRM_Core_BAO_MessageTemplate::renderTemplate([ 'messageTemplate' => [ - 'msg_text' => $tokenText, - 'msg_html' => $tokenHtml, + 'msg_text' => $text, + 'msg_html' => $html, 'msg_subject' => $tokenSubject, ], 'tokenContext' => $tokenContext, -- 2.25.1