From 7e50a87e14c82c2a49a08b10cbfc3471c326e473 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Thomas=20Sch=C3=BCttler?= Date: Mon, 19 Jun 2017 12:38:26 +0200 Subject: [PATCH] CRM-20746 - CiviMail - Use body_text for text part of resubscription confirmation mails ---------------------------------------- * CRM-20746: CiviMail - text part of resubscribe confirmation mail contains html https://issues.civicrm.org/jira/browse/CRM-20746 --- CRM/Mailing/Event/BAO/Resubscribe.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CRM/Mailing/Event/BAO/Resubscribe.php b/CRM/Mailing/Event/BAO/Resubscribe.php index 67639702e7..ac361de23c 100644 --- a/CRM/Mailing/Event/BAO/Resubscribe.php +++ b/CRM/Mailing/Event/BAO/Resubscribe.php @@ -260,7 +260,7 @@ class CRM_Mailing_Event_BAO_Resubscribe { $message->setHTMLBody($html); } if (!$html || $eq->format == 'Text' || $eq->format == 'Both') { - $text = CRM_Utils_Token::replaceDomainTokens($html, $domain, TRUE, $tokens['text']); + $text = CRM_Utils_Token::replaceDomainTokens($text, $domain, TRUE, $tokens['text']); $text = CRM_Utils_Token::replaceResubscribeTokens($text, $domain, $groups, FALSE, $eq->contact_id, $eq->hash); $text = CRM_Utils_Token::replaceActionTokens($text, $addresses, $urls, FALSE, $tokens['text']); $text = CRM_Utils_Token::replaceMailingTokens($text, $dao, NULL, $tokens['text']); -- 2.25.1