From: Jamie McClelland <jm@mayfirst.org>
Date: Wed, 28 Jan 2015 20:20:19 +0000 (-0500)
Subject: CRM-15882 - avoid PHP complaint about references
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=721248d40589aeb2ed5c37fe85c7a955ee32b457;p=civicrm-core.git

CRM-15882 - avoid PHP complaint about references

You have to include the & in the function too, and I don't think it's
really needed here.

----------------------------------------
* CRM-15882: batch merge overwrites addresses rather than try to preserve them
  https://issues.civicrm.org/jira/browse/CRM-15882
---

diff --git a/CRM/Dedupe/Merger.php b/CRM/Dedupe/Merger.php
index 0ac9cd1ad8..0050495d95 100644
--- a/CRM/Dedupe/Merger.php
+++ b/CRM/Dedupe/Merger.php
@@ -645,7 +645,7 @@ INNER JOIN  civicrm_membership membership2 ON membership1.membership_type_id = m
 
         // Generate var $migrationInfo. The variable structure is exactly same as
         // $formValues submitted during a UI merge for a pair of contacts.
-        $rowsElementsAndInfo = &CRM_Dedupe_Merger::getRowsElementsAndInfo($mainId, $otherId);
+        $rowsElementsAndInfo = CRM_Dedupe_Merger::getRowsElementsAndInfo($mainId, $otherId);
 
         $migrationInfo = &$rowsElementsAndInfo['migration_info'];