From 64f8b550f1be4aed7032ab1bac2dff494c26169b Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Wed, 5 Apr 2023 10:29:34 +1200
Subject: [PATCH] Remove upgrade custom field handling from Dedupe code

---
 CRM/Dedupe/Merger.php | 25 ++++++++-----------------
 1 file changed, 8 insertions(+), 17 deletions(-)

diff --git a/CRM/Dedupe/Merger.php b/CRM/Dedupe/Merger.php
index 1f8d4fccc7..60dd545160 100644
--- a/CRM/Dedupe/Merger.php
+++ b/CRM/Dedupe/Merger.php
@@ -1752,7 +1752,7 @@ INNER JOIN  civicrm_membership membership2 ON membership1.membership_type_id = m
     // create a new tree
 
     // legacy hardcoded list of data to return
-    $tableData = [
+    $toReturn = [
       'custom_field' => [
         'id',
         'name',
@@ -1773,6 +1773,7 @@ INNER JOIN  civicrm_membership membership2 ON membership1.membership_type_id = m
         'time_format',
         'option_group_id',
         'in_selector',
+        'serialize',
       ],
       'custom_group' => [
         'id',
@@ -1788,19 +1789,9 @@ INNER JOIN  civicrm_membership membership2 ON membership1.membership_type_id = m
         'extends_entity_column_id',
         'extends_entity_column_value',
         'max_multiple',
+        'is_public',
       ],
     ];
-    $current_db_version = CRM_Core_BAO_Domain::version();
-    $is_public_version = version_compare($current_db_version, '4.7.19', '>=');
-    $serialize_version = version_compare($current_db_version, '5.27.alpha1', '>=');
-    if ($is_public_version) {
-      $tableData['custom_group'][] = 'is_public';
-    }
-    if ($serialize_version) {
-      $tableData['custom_field'][] = 'serialize';
-    }
-
-    $toReturn = $tableData;
 
     // create select
     $select = [];
@@ -1809,17 +1800,17 @@ INNER JOIN  civicrm_membership membership2 ON membership1.membership_type_id = m
         $select[] = "civicrm_{$tableName}.{$columnName} as civicrm_{$tableName}_{$columnName}";
       }
     }
-    $strSelect = "SELECT " . implode(', ', $select);
+    $strSelect = 'SELECT ' . implode(', ', $select);
 
     // from, where, order by
-    $strFrom = "
+    $strFrom = '
 FROM     civicrm_custom_group
 LEFT JOIN civicrm_custom_field ON (civicrm_custom_field.custom_group_id = civicrm_custom_group.id)
-";
+';
 
     // if entity is either individual, organization or household pls get custom groups for 'contact' too.
-    if ($entityType == "Individual" || $entityType == 'Organization' ||
-      $entityType == 'Household'
+    if ($entityType === 'Individual' || $entityType === 'Organization' ||
+      $entityType === 'Household'
     ) {
       $in = "'$entityType', 'Contact'";
     }
-- 
2.25.1