Merge pull request #23581 from colemanw/removeUnused

[civicrm-core.git] / CRM / Contact / Tokens.php

diff --git a/CRM/Contact/Tokens.php b/CRM/Contact/Tokens.php
index a713d8cc25847b536453324ac85d1304a569cc1e..731b2f330ceb8e8d689690e34c44ba9c83e3cf49 100644 (file)
--- a/CRM/Contact/Tokens.php
+++ b/CRM/Contact/Tokens.php
@@ -316,7 +316,7 @@ class CRM_Contact_Tokens extends CRM_Core_EntityTokens {
             ->tokens('contact', $token, "cs={$cs}");
         }
         elseif ($token === 'signature_html') {
-          $row->format('text/html')->tokens('contact', $token, html_entity_decode($row->context['contact'][$token]));
+          $row->format('text/html')->tokens('contact', $token, html_entity_decode($this->getFieldValue($row, $token)));
         }
         else {
           parent::evaluateToken($row, $this->entity, $token, $row->context['contact']);
@@ -380,6 +380,9 @@ class CRM_Contact_Tokens extends CRM_Core_EntityTokens {
 
     foreach ($this->getRelatedEntityTokenMetadata() as $entity => $exposedFields) {
       $apiEntity = ($entity === 'openid') ? 'OpenID' : ucfirst($entity);
+      if ($apiEntity === 'Im') {
+        $apiEntity = 'IM';
+      }
       $metadata = (array) civicrm_api4($apiEntity, 'getfields', ['checkPermissions' => FALSE], 'name');
       foreach ($metadata as $field) {
         $this->addFieldToTokenMetadata($tokensMetadata, $field, $exposedFields, 'primary_' . $entity);