From c917824bea74e73f3d7ce8a247cce77f62280214 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Thu, 16 Jun 2016 17:43:50 +1200
Subject: [PATCH] Minor code tidy-ups. Remove unused var, add comments

---
 CRM/Contact/Page/AJAX.php        | 4 ----
 CRM/Contact/Page/DedupeMerge.php | 4 ++++
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CRM/Contact/Page/AJAX.php b/CRM/Contact/Page/AJAX.php
index 5255a0aab1..2ff0ea6a69 100644
--- a/CRM/Contact/Page/AJAX.php
+++ b/CRM/Contact/Page/AJAX.php
@@ -661,10 +661,6 @@ LIMIT {$offset}, {$rowCount}
     if ($rowCount < 0) {
       $rowCount = 0;
     }
-    $contactType = '';
-    if ($rgid) {
-      $contactType = CRM_Core_DAO::getFieldValue('CRM_Dedupe_DAO_RuleGroup', $rgid, 'contact_type');
-    }
 
     $whereClause = $orderByClause = '';
     $cacheKeyString   = CRM_Dedupe_Merger::getMergeCacheKeyString($rgid, $gid);
diff --git a/CRM/Contact/Page/DedupeMerge.php b/CRM/Contact/Page/DedupeMerge.php
index 93b0a1ddd9..3c52f02683 100644
--- a/CRM/Contact/Page/DedupeMerge.php
+++ b/CRM/Contact/Page/DedupeMerge.php
@@ -125,7 +125,11 @@ class CRM_Contact_Page_DedupeMerge extends CRM_Core_Page {
    * @param int $rgid
    * @param int $gid
    * @param string $mode
+   *   'safe' mode or 'force' mode.
    * @param bool $autoFlip
+   *   Override the values in the prevnext table & use the lowest value?
+   *   As the form offers the user to flip the values themselves this should
+   *   only be TRUE if you wish to ignore the user.
    * @param int $batchLimit
    * @param int $isSelected
    *
-- 
2.25.1