Minor code tidy-ups. Remove unused var, add comments

diff --git a/CRM/Contact/Page/AJAX.php b/CRM/Contact/Page/AJAX.php
index 5255a0aab1b33ed1e864846fa70dd8548f8f5f13..2ff0ea6a69de1e55b553f662b9959d161ec3b976 100644 (file)
--- 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 93b0a1ddd90b672e3db6bd38a73a30d7f62d1fe7..3c52f026839721cb8ec2c972d94e033fb8e8d93e 100644 (file)
--- 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
    *