From 5e67eb7ff3f1f202d5112d15ad5c6a5f23f35795 Mon Sep 17 00:00:00 2001 From: eileen Date: Fri, 16 Apr 2021 11:53:30 +1200 Subject: [PATCH] Simplify mailing check This should do the same thing - note org is never defined so replaceOrgTokens does nothing (& is not used anywhere else) --- CRM/SMS/Form/Upload.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/CRM/SMS/Form/Upload.php b/CRM/SMS/Form/Upload.php index e9d2efb311..c39cdb03fa 100644 --- a/CRM/SMS/Form/Upload.php +++ b/CRM/SMS/Form/Upload.php @@ -338,14 +338,12 @@ class CRM_SMS_Form_Upload extends CRM_Core_Form { $dummy_mail = new CRM_Mailing_BAO_Mailing(); $mess = "body_text"; $dummy_mail->$mess = $str; + $str = CRM_Core_BAO_MessageTemplate::renderMessageTemplate(['text' => $str, 'html' => '', 'subject' => ''], TRUE, CRM_Core_Session::getLoggedInContactID(), [])['text']; $tokens = $dummy_mail->getTokens(); $str = CRM_Utils_Token::replaceSubscribeInviteTokens($str); - $str = CRM_Utils_Token::replaceDomainTokens($str, $domain, NULL, $tokens['text']); $str = CRM_Utils_Token::replaceMailingTokens($str, $mailing, NULL, $tokens['text']); - $str = CRM_Utils_Token::replaceOrgTokens($str, $org); $str = CRM_Utils_Token::replaceActionTokens($str, $verp, $urls, NULL, $tokens['text']); - $str = CRM_Utils_Token::replaceContactTokens($str, $contact, NULL, $tokens['text']); $unmatched = CRM_Utils_Token::unmatchedTokens($str); $contentCheck = CRM_Utils_String::htmlToText($str); -- 2.25.1