CRM-19035 clean up references to srcID & dstID

diff --git a/CRM/Dedupe/Finder.php b/CRM/Dedupe/Finder.php
index 77e36cd1e9bcbc90b4cdacf11be4c203024fbac5..e41e73955a6e865b0450e64cc5bc039b4ae9d23f 100644 (file)
--- a/CRM/Dedupe/Finder.php
+++ b/CRM/Dedupe/Finder.php
@@ -372,9 +372,8 @@ class CRM_Dedupe_Finder {
       $cids[$dupe[1]] = 1;
     }
     $cidString = implode(', ', array_keys($cids));
-    $sql = "SELECT id, display_name FROM civicrm_contact WHERE id IN ($cidString) ORDER BY sort_name";
-    $dao = new CRM_Core_DAO();
-    $dao->query($sql);
+
+    $dao = CRM_Core_DAO::executeQuery("SELECT id, display_name FROM civicrm_contact WHERE id IN ($cidString) ORDER BY sort_name");
     $displayNames = array();
     while ($dao->fetch()) {
       $displayNames[$dao->id] = $dao->display_name;
@@ -382,11 +381,11 @@ class CRM_Dedupe_Finder {
 
     $userId = CRM_Core_Session::singleton()->getLoggedInContactID();
     foreach ($foundDupes as $dupes) {
-      $srcID = $dupes[0];
-      $dstID = $dupes[1];
-      if ($dstID == $userId) {
-        $srcID = $dupes[1];
-        $dstID = $dupes[0];
+      $srcID = $dupes[1];
+      $dstID = $dupes[0];
+      if ($srcID == $userId) {
+        $srcID = $dstID;
+        $dstID = $userId;
       }
 
       $mainContacts[] = $row = array(
@@ -399,7 +398,7 @@ class CRM_Dedupe_Finder {
       );
 
       $data = CRM_Core_DAO::escapeString(serialize($row));
-      $values[] = " ( 'civicrm_contact', $srcID, $dstID, '$cacheKeyString', '$data' ) ";
+      $values[] = " ( 'civicrm_contact', $dstID, $srcID, '$cacheKeyString', '$data' ) ";
     }
     CRM_Core_BAO_PrevNextCache::setItem($values);
     return $mainContacts;

diff --git a/CRM/Dedupe/Merger.php b/CRM/Dedupe/Merger.php
index 44a75533721fec7801f36df3a984eeb9f6673985..fb6a4eee8b0695111121fc2a6139533bc9551c89 100644 (file)
--- a/CRM/Dedupe/Merger.php
+++ b/CRM/Dedupe/Merger.php
@@ -706,7 +706,7 @@ INNER JOIN  civicrm_membership membership2 ON membership1.membership_type_id = m
       $msg = "{$stats['merged']} " . ts('Contact(s) were merged.');
     }
     if (!empty($stats['skipped'])) {
-      $msg .= $stats['skipped'] . ts('Contact(s) were skipped.');
+      $msg .= $stats['skipped'] . ts(' Contact(s) were skipped.');
     }
     return $msg;
   }

diff --git a/templates/CRM/Contact/Page/DedupeFind.tpl b/templates/CRM/Contact/Page/DedupeFind.tpl
index 5742b30b024a478756247cef1ea4c6655f884ca7..034efb3b992bf47072230f4f6239c372931531e7 100644 (file)
--- a/templates/CRM/Contact/Page/DedupeFind.tpl
+++ b/templates/CRM/Contact/Page/DedupeFind.tpl
@@ -98,16 +98,16 @@
     <thead>
       <tr class="columnheader">
         <th data-data="is_selected_input" class="crm-dedupe-selection"><input type="checkbox" value="0" name="pnid_all" class="crm-dedupe-select-all"></th>
-        <th data-data="src_image"    class="crm-empty">&nbsp;</th>
-        <th data-data="src"          class="crm-contact">{ts}Contact{/ts} 1</th>
         <th data-data="dst_image"    class="crm-empty">&nbsp;</th>
-        <th data-data="dst"          class="crm-contact-duplicate">{ts}Contact{/ts} 2 ({ts}Duplicate{/ts})</th>
-        <th data-data="src_email"    class="crm-contact">{ts}Email{/ts} 1</th>
-        <th data-data="dst_email"    class="crm-contact-duplicate">{ts}Email{/ts} 2 ({ts}Duplicate{/ts})</th>
-        <th data-data="src_street"   class="crm-contact">{ts}Street Address{/ts} 1</th>
-        <th data-data="dst_street"   class="crm-contact-duplicate">{ts}Street Address{/ts} 2 ({ts}Duplicate{/ts})</th>
-        <th data-data="src_postcode" class="crm-contact">{ts}Postcode{/ts} 1</th>
-        <th data-data="dst_postcode" class="crm-contact-duplicate">{ts}Postcode{/ts} 2 ({ts}Duplicate{/ts})</th>
+        <th data-data="dst"          class="crm-contact">{ts}Contact{/ts} 1</th>
+        <th data-data="src_image"    class="crm-empty">&nbsp;</th>
+        <th data-data="src"          class="crm-contact-duplicate">{ts}Contact{/ts} 2 ({ts}Duplicate{/ts})</th>
+        <th data-data="dst_email"    class="crm-contact">{ts}Email{/ts} 1</th>
+        <th data-data="src_email"    class="crm-contact-duplicate">{ts}Email{/ts} 2 ({ts}Duplicate{/ts})</th>
+        <th data-data="dst_street"   class="crm-contact">{ts}Street Address{/ts} 1</th>
+        <th data-data="src_street"   class="crm-contact-duplicate">{ts}Street Address{/ts} 2 ({ts}Duplicate{/ts})</th>
+        <th data-data="dst_postcode" class="crm-contact">{ts}Postcode{/ts} 1</th>
+        <th data-data="src_postcode" class="crm-contact-duplicate">{ts}Postcode{/ts} 2 ({ts}Duplicate{/ts})</th>
         <th data-data="conflicts"    class="crm-contact-conflicts">{ts}Conflicts{/ts}</th>
         <th data-data="weight"       class="crm-threshold">{ts}Threshold{/ts}</th>
         <th data-data="actions"      class="crm-empty">&nbsp;</th>