From c940014dce8bd5001aa5fdb08aee7b8b5809d4e7 Mon Sep 17 00:00:00 2001 From: Jamie McClelland Date: Wed, 28 Jan 2015 15:21:08 -0500 Subject: [PATCH] CRM-15882 - fixing silly typo that should have no impact on functionality. ---------------------------------------- * CRM-15882: batch merge overwrites addresses rather than try to preserve them https://issues.civicrm.org/jira/browse/CRM-15882 --- CRM/Dedupe/Merger.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CRM/Dedupe/Merger.php b/CRM/Dedupe/Merger.php index 0050495d95..3f926f7589 100644 --- a/CRM/Dedupe/Merger.php +++ b/CRM/Dedupe/Merger.php @@ -658,10 +658,10 @@ INNER JOIN civicrm_membership membership2 ON membership1.membership_type_id = m // go ahead with merge if there is no conflict if (!CRM_Dedupe_Merger::skipMerge($mainId, $otherId, $migrationInfo, $mode)) { CRM_Dedupe_Merger::moveAllBelongings($mainId, $otherId, $migrationInfo); - $resultStats['merged'][] = array('main_d' => $mainId, 'other_id' => $otherId); + $resultStats['merged'][] = array('main_id' => $mainId, 'other_id' => $otherId); } else { - $resultStats['skipped'][] = array('main_d' => $mainId, 'other_id' => $otherId); + $resultStats['skipped'][] = array('main_id' => $mainId, 'other_id' => $otherId); } // delete entry from PrevNextCache table so we don't consider the pair next time -- 2.25.1