From: Jamie McClelland <jm@mayfirst.org>
Date: Wed, 28 Jan 2015 20:21:08 +0000 (-0500)
Subject: CRM-15882 - fixing silly typo that should have no impact on
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=c940014dce8bd5001aa5fdb08aee7b8b5809d4e7;p=civicrm-core.git

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 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