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

diff --git a/CRM/Dedupe/Merger.php b/CRM/Dedupe/Merger.php
index 0050495d955ec8b25f208c1416250bd017d3dc7c..3f926f75899895248a1d1743322b0a9132e6f792 100644 (file)
--- 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