Remove calls to replaceContributionTokens

civicrm · Sep 24, 2021 · 5dc031f · 5dc031f
1 parent f3119af
commit 5dc031f
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 17 deletions.
diff --git a/CRM/Contribute/Form/Task/PDFLetter.php b/CRM/Contribute/Form/Task/PDFLetter.php
@@ -546,19 +546,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(['html' => $html_message], $tokenContext, $smarty)['html'];
   }
 
 }
diff --git a/Civi/Token/TokenRow.php b/Civi/Token/TokenRow.php
@@ -186,7 +186,7 @@ public function customToken($entity, $customFieldID, $entityID) {
       $fieldValue = \CRM_Core_BAO_CustomField::displayValue($fieldValue, $customFieldID);
     }
 
-    return $this->tokens($entity, $customFieldName, $fieldValue);
+    return $this->format('text/html')->tokens($entity, $customFieldName, $fieldValue);
   }
 
   /**

diff --git a/tests/phpunit/CRM/Contribute/Form/Task/PDFLetterCommonTest.php b/tests/phpunit/CRM/Contribute/Form/Task/PDFLetterCommonTest.php
@@ -297,19 +297,19 @@ public function testAllContributionTokens(): void {
   <body>
     <div id="crm-container">
 id : 1
-total_amount : € 9,999.99
-fee_amount : € 1,111.11
-net_amount : € 7,777.78
-non_deductible_amount : € 2,222.22
+total_amount : &euro; 9,999.99
+fee_amount : &euro; 1,111.11
+net_amount : &euro; 7,777.78
+non_deductible_amount : &euro; 2,222.22
 receive_date : July 20th, 2018 12:00 AM
 payment_instrument_id:label : Check
 trxn_id : 1234
 invoice_id : 568
 currency : EUR
-cancel_date : 2019-12-30 00:00:00
+cancel_date : December 30th, 2019 12:00 AM
 cancel_reason : Contribution Cancel Reason
 receipt_date : October 30th, 2019 12:00 AM
-thankyou_date : 2019-11-30 00:00:00
+thankyou_date : November 30th, 2019 12:00 AM
 source : Contribution Source
 amount_level : Amount Level
 contribution_status_id : 2

diff --git a/tests/phpunit/CRM/Utils/TokenConsistencyTest.php b/tests/phpunit/CRM/Utils/TokenConsistencyTest.php
@@ -470,8 +470,8 @@ protected function getExpectedEventTokenOutput(): string {
 Emerald City, Maine 90210
 
 $ 50.00
-' . CRM_Utils_System::url('civicrm/event/info', NULL, TRUE) . '&amp;reset=1&amp;id=1
-' . CRM_Utils_System::url('civicrm/event/register', NULL, TRUE) . '&amp;reset=1&amp;id=1
+' . CRM_Utils_System::url('civicrm/event/info', NULL, TRUE) . '&reset=1&id=1
+' . CRM_Utils_System::url('civicrm/event/register', NULL, TRUE) . '&reset=1&id=1
 
 my field';
   }
-Original file line number
+Diff line change
@@ Expand Up @@
           $fieldValue = \CRM_Core_BAO_CustomField::displayValue($fieldValue, $customFieldID);
         }
-        return $this->tokens($entity, $customFieldName, $fieldValue);
+        return $this->format('text/html')->tokens($entity, $customFieldName, $fieldValue);
       }
       /**
@@ Expand Down @@