From: eileen <eileen@fuzion.co.nz>
Date: Fri, 6 Sep 2013 04:36:54 +0000 (+1200)
Subject: CRM-13318  revert part of Coleman's patch that breaks profile retrieval
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=be3f483917b2f6206a844720d040f2e07712db71;p=civicrm-core.git

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 7154f3ec95..188171c0b9 100644
--- 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;
     }