Merge pull request #23348 from colemanw/getFieldsSuffixes

[civicrm-core.git] / Civi / Api4 / Generic / BasicGetAction.php

diff --git a/Civi/Api4/Generic/BasicGetAction.php b/Civi/Api4/Generic/BasicGetAction.php
index 1f784cc6b90333d5b675cee80b15a41e46737ee7..8f5ffdc1d7fe46067108677c58af29008fd077c4 100644 (file)
--- a/Civi/Api4/Generic/BasicGetAction.php
+++ b/Civi/Api4/Generic/BasicGetAction.php
@@ -107,19 +107,19 @@ class BasicGetAction extends AbstractGetAction {
     $fields = $this->entityFields();
     foreach ($records as &$values) {
       foreach ($this->entityFields() as $field) {
+        $values += [$field['name'] => NULL];
         if (!empty($field['options'])) {
           foreach (FormattingUtil::$pseudoConstantSuffixes as $suffix) {
             $pseudofield = $field['name'] . ':' . $suffix;
             if (!isset($values[$pseudofield]) && isset($values[$field['name']]) && $this->_isFieldSelected($pseudofield)) {
               $values[$pseudofield] = $values[$field['name']];
-              $fields[$pseudofield] = $field;
             }
           }
         }
       }
     }
     // Swap raw values with pseudoconstants
-    FormattingUtil::formatOutputValues($records, $fields, $this->getEntityName(), $this->getActionName());
+    FormattingUtil::formatOutputValues($records, $fields, $this->getActionName());
   }
 
 }