From: eileen <emcnaughton@wikimedia.org>
Date: Mon, 16 May 2016 22:35:46 +0000 (+1200)
Subject: CRM-18517 get conflicts dependent on mode
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=e6f54bf502dd8e51e1b235ab5eee9f65f03ed2b2;p=civicrm-core.git

CRM-18517 get conflicts dependent on mode
---

diff --git a/CRM/Dedupe/Merger.php b/CRM/Dedupe/Merger.php
index a65babad76..83c6a6c57f 100644
--- a/CRM/Dedupe/Merger.php
+++ b/CRM/Dedupe/Merger.php
@@ -595,7 +595,7 @@ INNER JOIN  civicrm_membership membership2 ON membership1.membership_type_id = m
   public static function batchMerge($rgid, $gid = NULL, $mode = 'safe', $autoFlip = TRUE, $batchLimit = 1, $isSelected = 2) {
     $redirectForPerformance = ($batchLimit > 1) ? TRUE : FALSE;
     $reloadCacheIfEmpty = (!$redirectForPerformance && $isSelected == 2);
-    $dupePairs = self::getDuplicatePairs($rgid, $gid, $reloadCacheIfEmpty, $batchLimit, $isSelected, '', FALSE);
+    $dupePairs = self::getDuplicatePairs($rgid, $gid, $reloadCacheIfEmpty, $batchLimit, $isSelected, '', ($mode == 'aggressive'));
 
     $cacheParams = array(
       'cache_key_string' => self::getMergeCacheKeyString($rgid, $gid),