From be3f483917b2f6206a844720d040f2e07712db71 Mon Sep 17 00:00:00 2001
From: eileen <eileen@fuzion.co.nz>
Date: Fri, 6 Sep 2013 16:36:54 +1200
Subject: [PATCH] CRM-13318  revert part of Coleman's patch that breaks profile
 retrieval

---
 CRM/Contact/BAO/Query.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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;
     }
-- 
2.25.1