From d8ea987ea5bd8c75357edf977bfa3f4c6f327bfa Mon Sep 17 00:00:00 2001 From: Sarah Gladstone Date: Mon, 28 Apr 2014 18:19:54 -0400 Subject: [PATCH] X-Powered-By: PHP/5.3.27 Content-type: text/html CRM-14507 - Domain tokens using HTML in plain text portion ---------------------------------------- * CRM-14507: Domain token replacement in Message Templates uses HTML tokens for text parts https://issues.civicrm.org/jira/browse/CRM-14507 --- CRM/Core/BAO/MessageTemplate.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/CRM/Core/BAO/MessageTemplate.php b/CRM/Core/BAO/MessageTemplate.php index 761e8f51c7..1e03cdbba5 100644 --- a/CRM/Core/BAO/MessageTemplate.php +++ b/CRM/Core/BAO/MessageTemplate.php @@ -425,8 +425,8 @@ class CRM_Core_BAO_MessageTemplate extends CRM_Core_DAO_MessageTemplate { $contact = $contact[$contactID]; } - $subject = CRM_Utils_Token::replaceDomainTokens($subject, $domain, TRUE, $tokens['text'], TRUE); - $text = CRM_Utils_Token::replaceDomainTokens($text, $domain, TRUE, $tokens['text'], TRUE); + $subject = CRM_Utils_Token::replaceDomainTokens($subject, $domain, FALSE, $tokens['text'], TRUE); + $text = CRM_Utils_Token::replaceDomainTokens($text, $domain, FALSE, $tokens['text'], TRUE); $html = CRM_Utils_Token::replaceDomainTokens($html, $domain, TRUE, $tokens['html'], TRUE); if ($contactID) { @@ -509,4 +509,3 @@ class CRM_Core_BAO_MessageTemplate extends CRM_Core_DAO_MessageTemplate { return array($sent, $subject, $text, $html); } } - -- 2.25.1