Remove calls to replaceContributionTokens

civicrm · Sep 18, 2021 · c97af7a · c97af7a
1 parent 245b4fe
commit c97af7a
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/CRM/Contribute/Form/Task/PDFLetter.php b/CRM/Contribute/Form/Task/PDFLetter.php
@@ -533,19 +533,19 @@ public static function isValidHTMLWithTableSeparator($tokens, $html) {
    * @return string
    */
   protected function resolveTokens(string $html_message, $contact, $contribution, $messageToken, $grouped, $separator, $contributions): string {
-    if ($grouped) {
-      $tokenHtml = CRM_Utils_Token::replaceMultipleContributionTokens($separator, $html_message, $contributions, $messageToken);
-    }
-    else {
-      // no change to normal behaviour to avoid risk of breakage
-      $tokenHtml = CRM_Utils_Token::replaceContributionTokens($html_message, $contribution, TRUE, $messageToken);
-    }
     $tokenContext = [
       'smarty' => (defined('CIVICRM_MAIL_SMARTY') && CIVICRM_MAIL_SMARTY),
       'contactId' => $contact['contact_id'],
     ];
+    if ($grouped) {
+      $html_message = CRM_Utils_Token::replaceMultipleContributionTokens($separator, $html_message, $contributions, $messageToken);
+    }
+    else {
+      $tokenContext['schema'] = ['contributionId'];
+      $tokenContext['contributionId'] = $contribution['id'];
+    }
     $smarty = ['contact' => $contact];
-    return CRM_Core_TokenSmarty::render(['html' => $tokenHtml], $tokenContext, $smarty)['html'];
+    return CRM_Core_TokenSmarty::render(['text' => $html_message], $tokenContext, $smarty)['text'];
   }
 
 }