minor changes for partcipant.Get

diff --git a/CRM/Contact/BAO/Query.php b/CRM/Contact/BAO/Query.php
index c643f9edeb6b2ae026626169a30f9c1aeb445776..f9efcaaf50a32ff26b0eb55f25735af1813e523f 100644 (file)
--- a/CRM/Contact/BAO/Query.php
+++ b/CRM/Contact/BAO/Query.php
@@ -5483,10 +5483,11 @@ AND   displayRelType.is_active = 1
    *
    * @param CRM_Core_DAO $dao
    * @param bool $return
+   * @param bool $usedForAPI
    *
    * @return array|NULL
    */
-  public function convertToPseudoNames(&$dao, $return = FALSE) {
+  public function convertToPseudoNames(&$dao, $return = FALSE, $usedForAPI = FALSE) {
     if (empty($this->_pseudoConstantsSelect)) {
       return NULL;
     }
@@ -5528,7 +5529,7 @@ AND   displayRelType.is_active = 1
               $viewValues[$k] = $pseudoOptions[$v];
             }
           }
-          $dao->$key = implode(', ', $viewValues);
+          $dao->$key = ($usedForAPI && count($viewValues) > 1) ? $viewValues : implode(', ', $viewValues);
         }
         else {
           $labels = CRM_Core_OptionGroup::values($value['pseudoField']);

diff --git a/api/v3/Participant.php b/api/v3/Participant.php
index 19442ceb791912064cf5c325c3582b94ef3eb204..20997ea064729610963b2904bd6b88c228f28091 100644 (file)
--- a/api/v3/Participant.php
+++ b/api/v3/Participant.php
@@ -163,7 +163,7 @@ function civicrm_api3_participant_get($params) {
 
   $participant = array();
   while ($dao->fetch()) {
-    $query->convertToPseudoNames($dao);
+    $query->convertToPseudoNames($dao, FALSE, TRUE);
     $participant[$dao->participant_id] = $query->store($dao);
     //@todo - is this required - contribution & pledge use the same query but don't self-retrieve custom data
     _civicrm_api3_custom_data_get($participant[$dao->participant_id], 'Participant', $dao->participant_id, NULL);