CRM-15882 - avoid PHP complaint about references
authorJamie McClelland <jm@mayfirst.org>
Wed, 28 Jan 2015 20:20:19 +0000 (15:20 -0500)
committerJamie McClelland <jm@mayfirst.org>
Wed, 28 Jan 2015 20:20:19 +0000 (15:20 -0500)
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

CRM/Dedupe/Merger.php

index 0ac9cd1ad8f3316c9cedd3867dccf32efdef8fcf..0050495d955ec8b25f208c1416250bd017d3dc7c 100644 (file)
@@ -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'];