Fix token subscriber to format the display of the custom tokens

civicrm · Mar 15, 2021 · 6103e5c · 6103e5c
1 parent a1cd8ab
commit 6103e5c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/Civi/Token/TokenCompatSubscriber.php b/Civi/Token/TokenCompatSubscriber.php
@@ -58,7 +58,7 @@ public function onEvaluate(TokenValueEvent $e) {
         $params = [
           ['contact_id', '=', $contactId, 0, 0],
         ];
-        [$contact] = \CRM_Contact_BAO_Query::apiQuery($params);
+        [$contact] = \CRM_Contact_BAO_Query::apiQuery($params, array_fill_keys($messageTokens['contact'], 1));
         //CRM-4524
         $contact = reset($contact);
         if (!$contact || is_a($contact, 'CRM_Core_Error')) {
@@ -71,10 +71,7 @@ public function onEvaluate(TokenValueEvent $e) {
         if (!empty($messageTokens['contact'])) {
           foreach ($messageTokens['contact'] as $token) {
             if (\CRM_Core_BAO_CustomField::getKeyID($token)) {
-              $contact[$token] = civicrm_api3('Contact', 'getvalue', [
-                'return' => $token,
-                'id' => $contactId,
-              ]);
+              $contact[$token] = \CRM_Core_BAO_CustomField::displayValue($contact[$token], \CRM_Core_BAO_CustomField::getKeyID($token));
             }
           }
         }

diff --git a/tests/phpunit/CRM/Core/BAO/MessageTemplateTest.php b/tests/phpunit/CRM/Core/BAO/MessageTemplateTest.php
@@ -182,8 +182,8 @@ public function testContactTokens(): void {
   public function testContactTokensRenderedByTokenProcessor(): void {
     $this->createCustomGroupWithFieldsOfAllTypes([]);
     $tokenData = $this->getAllContactTokens();
-    // @todo - these 2 still need fixing/ syncing.
-    unset($tokenData['preferred_communication_method'], $tokenData['addressee']);
+    // @todo - these still need fixing/ syncing.
+    unset($tokenData['preferred_communication_method'], $tokenData['addressee'], $tokenData['email_greeting'], $tokenData['postal_greeting']);
     $address = $this->setupContactFromTokeData($tokenData);
     $tokenString ='';
     foreach (array_keys($tokenData) as $key) {
@@ -198,8 +198,11 @@ public function testContactTokensRenderedByTokenProcessor(): void {
       $rendered = (string) $row->render('html');
     }
     $expected = $this->getExpectedContactOutput($address['id'], $tokenData, $rendered);
-    // @todo - fix these 2 & stop stripping them out.
-    $expected = str_replace(["preferred_communication_method:\n", "addressee:Mr. Robert Frank Smith II\n"], '', $expected);
+    // @todo - fix these & stop stripping them out.
+    $expected = str_replace([
+      "preferred_communication_method:\n",
+      "addressee:Mr. Robert Frank Smith II\n"
+    ], '', $expected);
     $this->assertEquals($expected, $rendered);
   }