Merge pull request #13280 from aydun/tokenrow_fix

Fix \Civi\Token\TokenRow::customToken() failure if field is not set
civicrm · Jan 3, 2019 · 44e82e1 · 44e82e1
2 parents fddfd6a + e5e0c47
commit 44e82e1
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/Civi/Token/TokenRow.php b/Civi/Token/TokenRow.php
@@ -136,10 +136,11 @@ public function tokens($a = NULL, $b = NULL, $c = NULL) {
    */
   public function customToken($entity, $customFieldID, $entityID) {
     $customFieldName = "custom_" . $customFieldID;
-    $fieldValue = civicrm_api3($entity, 'getvalue', array(
+    $record = civicrm_api3($entity, "getSingle", [
       'return' => $customFieldName,
-      'id' => $entityID,
-    ));
+       'id' => $entityID,
+    ]);
+    $fieldValue = \CRM_Utils_Array::value($customFieldName, $record, '');
 
     // format the raw custom field value into proper display value
     if (isset($fieldValue)) {