From 96a118e6967d5e053920aad3fe6e903bde5ed2c0 Mon Sep 17 00:00:00 2001 From: eileen Date: Wed, 15 Apr 2020 09:43:48 +1200 Subject: [PATCH] Follow up fix on change to merge sqls This turns out to have been a missing piece from https://github.com/civicrm/civicrm-core/pull/17060 as revealed from https://github.com/civicrm/civicrm-core/pull/17072 --- CRM/Dedupe/Merger.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CRM/Dedupe/Merger.php b/CRM/Dedupe/Merger.php index ff244b39d6..d3fcacca62 100644 --- a/CRM/Dedupe/Merger.php +++ b/CRM/Dedupe/Merger.php @@ -584,7 +584,7 @@ INNER JOIN civicrm_membership membership2 ON membership1.membership_type_id = m ->setCheckPermissions(FALSE) ->setSelect(['table_name']) ->addWhere('is_multiple', '=', 0) - ->addWhere('extends', 'IN', CRM_Contact_BAO_ContactType::contactTypes()) + ->addWhere('extends', 'IN', array_merge(['Contact'], CRM_Contact_BAO_ContactType::contactTypes())) ->execute() ->indexBy('table_name'); foreach (array_intersect_key($cidRefs, $customTables) as $tableName => $cidSpec) { @@ -702,6 +702,7 @@ INNER JOIN civicrm_membership membership2 ON membership1.membership_type_id = m * * @throws \CRM_Core_Exception * @throws \CiviCRM_API3_Exception + * @throws \API_Exception */ public static function batchMerge($rgid, $gid = NULL, $mode = 'safe', $batchLimit = 1, $isSelected = 2, $criteria = [], $checkPermissions = TRUE, $reloadCacheIfEmpty = NULL, $searchLimit = 0) { $redirectForPerformance = $batchLimit > 1; -- 2.25.1