Fix unreleased regression from mistake extracting function
authoreileen <emcnaughton@wikimedia.org>
Tue, 9 Feb 2021 04:00:11 +0000 (17:00 +1300)
committereileen <emcnaughton@wikimedia.org>
Tue, 9 Feb 2021 04:00:15 +0000 (17:00 +1300)
Ports this line (merged to master) to 5.35 as the mistake turns out to affect 5.35
https://github.com/civicrm/civicrm-core/pull/19551/files#diff-447cfa0a0ec021e7cf54c6f207d94c3e3343eec930130a995355fec37a590a22R597

CRM/Core/BAO/MessageTemplate.php

index 70358b0702d88056d096b9b2a56cd111e946fb90..f7928bca8d5c918e9e9d84ca14287f7dde5bf963 100644 (file)
@@ -616,7 +616,7 @@ class CRM_Core_BAO_MessageTemplate extends CRM_Core_DAO_MessageTemplate {
     $domain = CRM_Core_BAO_Domain::getDomain();
     $mailContent['subject'] = CRM_Utils_Token::replaceDomainTokens($mailContent['subject'], $domain, FALSE, $tokens['subject'], $escapeSmarty);
     $mailContent['text'] = CRM_Utils_Token::replaceDomainTokens($mailContent['text'], $domain, FALSE, $tokens['text'], $escapeSmarty);
-    $mailContent['html'] = CRM_Utils_Token::replaceDomainTokens($mailContent['html'], $domain, TRUE, $tokens, $escapeSmarty);
+    $mailContent['html'] = CRM_Utils_Token::replaceDomainTokens($mailContent['html'], $domain, TRUE, $tokens['html'], $escapeSmarty);
     return $mailContent;
   }