Merge pull request #13283 from aydun/token_note_fix

Render Note field tokens correctly - they are already HTML.
civicrm · Mar 6, 2019 · d03484b · d03484b
2 parents 7e862b9 + 65ddce7
commit d03484b
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/Civi/Token/TokenRow.php b/Civi/Token/TokenRow.php
@@ -218,6 +218,7 @@ public function fill($format = NULL) {
       case 'text/html':
         // Plain => HTML.
         foreach ($textTokens as $entity => $values) {
+          $entityFields = civicrm_api3($entity, "getFields", array('api_action' => 'get'));
           foreach ($values as $field => $value) {
             if (!isset($htmlTokens[$entity][$field])) {
               // CRM-18420 - Activity Details Field are enclosed within <p>,
@@ -226,6 +227,10 @@ public function fill($format = NULL) {
               if ($entity == 'activity' && $field == 'details') {
                 $htmlTokens[$entity][$field] = $value;
               }
+              elseif (\CRM_Utils_Array::value('data_type', \CRM_Utils_Array::value($field, $entityFields['values'])) == 'Memo') {
+                // Memo fields aka custom fields of type Note are html.
+                $htmlTokens[$entity][$field] = CRM_Utils_String::purifyHTML($value);
+              }
               else {
                 $htmlTokens[$entity][$field] = htmlentities($value);
               }