From 063ffcb72cab2f43cbd4eb44a3088124e70d2636 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Tue, 12 Jul 2016 22:04:33 +1200
Subject: [PATCH] CRM-19035 follow on tidy up

---
 CRM/Contact/Page/AJAX.php       | 1 +
 CRM/Contact/Page/DedupeFind.php | 6 ------
 CRM/Dedupe/Finder.php           | 1 +
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/CRM/Contact/Page/AJAX.php b/CRM/Contact/Page/AJAX.php
index 4c1e37aa88..c98b4e78c6 100644
--- a/CRM/Contact/Page/AJAX.php
+++ b/CRM/Contact/Page/AJAX.php
@@ -777,6 +777,7 @@ LIMIT {$offset}, {$rowCount}
           break;
 
         default:
+          $orderByClause = " ORDER BY cc1.display_name ASC";
           break;
       }
     }
diff --git a/CRM/Contact/Page/DedupeFind.php b/CRM/Contact/Page/DedupeFind.php
index d9420b03b0..7567270707 100644
--- a/CRM/Contact/Page/DedupeFind.php
+++ b/CRM/Contact/Page/DedupeFind.php
@@ -207,12 +207,6 @@ class CRM_Contact_Page_DedupeFind extends CRM_Core_Page_Basic {
           CRM_Utils_System::redirect($url);
         }
         else {
-          // FIXME: sort the contacts; $displayName
-          // is already sort_name-sorted, so use that
-          // (also, consider sorting by dupe count first)
-          // lobo - change the sort to by threshold value
-          // so the more likely dupes are sorted first
-
           $mainContacts = CRM_Dedupe_Finder::parseAndStoreDupePairs($foundDupes, $cacheKeyString);
 
           if ($cid) {
diff --git a/CRM/Dedupe/Finder.php b/CRM/Dedupe/Finder.php
index 60f555241d..d020bb1480 100644
--- a/CRM/Dedupe/Finder.php
+++ b/CRM/Dedupe/Finder.php
@@ -383,6 +383,7 @@ class CRM_Dedupe_Finder {
     foreach ($foundDupes as $dupes) {
       $srcID = $dupes[1];
       $dstID = $dupes[0];
+      // The logged in user should never be the src (ie. the contact to be removed).
       if ($srcID == $userId) {
         $srcID = $dstID;
         $dstID = $userId;
-- 
2.25.1