Replace use of legacy dao->query()
authorEileen McNaughton <emcnaughton@wikimedia.org>
Sat, 18 Mar 2023 00:41:48 +0000 (13:41 +1300)
committerEileen McNaughton <emcnaughton@wikimedia.org>
Sat, 18 Mar 2023 06:48:44 +0000 (19:48 +1300)
CRM/Dedupe/Finder.php

index b86f9207214c17832dbbfe8891b7d70291d9f65c..77fe3d185c21c01adea407bfd4b77a24b09c78fb 100644 (file)
@@ -52,7 +52,7 @@ class CRM_Dedupe_Finder {
     while ($dao->fetch()) {
       $dupes[] = [$dao->id1, $dao->id2, $dao->weight];
     }
-    CRM_Core_DAO::executeQuery(($rgBao->tableDropQuery()));
+    CRM_Core_DAO::executeQuery($rgBao->tableDropQuery());
 
     return $dupes;
   }
@@ -122,15 +122,15 @@ class CRM_Dedupe_Finder {
     }
     $rgBao->params = $params;
     $rgBao->fillTable();
-    $dao = new CRM_Core_DAO();
-    $dao->query($rgBao->thresholdQuery($checkPermission));
+
+    $dao = CRM_Core_DAO::executeQuery($rgBao->thresholdQuery($checkPermission));
     $dupes = [];
     while ($dao->fetch()) {
       if (isset($dao->id) && $dao->id) {
         $dupes[] = $dao->id;
       }
     }
-    $dao->query($rgBao->tableDropQuery());
+    CRM_Core_DAO::executeQuery($rgBao->tableDropQuery());
     return array_diff($dupes, $except);
   }