CRM-13318 revert part of Coleman's patch that breaks profile retrieval

diff --git a/CRM/Contact/BAO/Query.php b/CRM/Contact/BAO/Query.php
index 7154f3ec95856da19b16cd88b5fdd04455b29b23..188171c0b9fbbdf5b0ce865377345634365fb69e 100644 (file)
--- a/CRM/Contact/BAO/Query.php
+++ b/CRM/Contact/BAO/Query.php
@@ -4174,7 +4174,7 @@ civicrm_relationship.start_date > {$today}
       $convertedVals = $query->convertToPseudoNames($dao, TRUE);
 
       if (!empty($convertedVals)) {
-        $val = $convertedVals + $val;
+        $val = array_merge_recursive($val, $convertedVals);
       }
       $values[$dao->contact_id] = $val;
     }