dev/core#2132 Fix for sort on search results

[civicrm-core.git] / CRM / Contact / Page / DedupeMerge.php

diff --git a/CRM/Contact/Page/DedupeMerge.php b/CRM/Contact/Page/DedupeMerge.php
index 0282912a5e2b3914fc30c6ad9b42150827feba1b..b4bf18bafa03473ddfd4628be5eca3a12426db26 100644 (file)
--- a/CRM/Contact/Page/DedupeMerge.php
+++ b/CRM/Contact/Page/DedupeMerge.php
@@ -56,7 +56,7 @@ class CRM_Contact_Page_DedupeMerge extends CRM_Core_Page {
     $criteria = json_decode($criteria, TRUE);
     $cacheKeyString = CRM_Dedupe_Merger::getMergeCacheKeyString($rgid, $gid, $criteria, TRUE, $limit);
 
-    if ($mode == 'aggressive' && !CRM_Core_Permission::check('force merge duplicate contacts')) {
+    if ($mode === 'aggressive' && !CRM_Core_Permission::check('force merge duplicate contacts')) {
       CRM_Core_Session::setStatus(ts('You do not have permission to force merge duplicate contact records'), ts('Permission Denied'), 'error');
       CRM_Utils_System::redirect(CRM_Utils_System::url('civicrm/contact/dedupefind', $urlQry));
     }
@@ -122,6 +122,7 @@ class CRM_Contact_Page_DedupeMerge extends CRM_Core_Page {
    *
    * @throws \CRM_Core_Exception
    * @throws \CiviCRM_API3_Exception
+   * @throws \API_Exception
    */
   public static function callBatchMerge(CRM_Queue_TaskContext $ctx, $rgid, $gid, $mode = 'safe', $batchLimit, $isSelected, $criteria, $searchLimit) {
     CRM_Dedupe_Merger::batchMerge($rgid, $gid, $mode, $batchLimit, $isSelected, $criteria, TRUE, FALSE, $searchLimit);