From f341d3efed68aefbe725bf9215b567871286116f Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Thu, 13 Apr 2023 12:17:27 +1200
Subject: [PATCH] Remove obsolete code

This was actually obsolete before the apiv4 switch I think - but it DEFINITELY is now
---
 CRM/Contact/BAO/Contact/Utils.php |  2 +-
 CRM/Dedupe/Merger.php             | 28 ----------------------------
 2 files changed, 1 insertion(+), 29 deletions(-)

diff --git a/CRM/Contact/BAO/Contact/Utils.php b/CRM/Contact/BAO/Contact/Utils.php
index 49f652be1f..c771a8aef8 100644
--- a/CRM/Contact/BAO/Contact/Utils.php
+++ b/CRM/Contact/BAO/Contact/Utils.php
@@ -291,7 +291,7 @@ WHERE  id IN ( $idString )
 
     if (!empty($existingRelationship)) {
       if ($existingRelationship['is_active']) {
-        if ($existingRelationship['contact_id_a.organization_name'] !== $existingRelationship['contact_id_b.organization_name']){
+        if ($existingRelationship['contact_id_a.organization_name'] !== $existingRelationship['contact_id_b.organization_name']) {
           self::setCurrentEmployer([$contactID => $employerID]);
         }
         // My work here is done.
diff --git a/CRM/Dedupe/Merger.php b/CRM/Dedupe/Merger.php
index 4a57398512..edd8c6e3ee 100644
--- a/CRM/Dedupe/Merger.php
+++ b/CRM/Dedupe/Merger.php
@@ -2026,34 +2026,6 @@ ORDER BY civicrm_custom_group.weight,
       $removeTables = [];
     }
 
-    // FIXME: fix gender, prefix and postfix, so they're edible by createProfileContact()
-    $names['gender'] = ['newName' => 'gender_id', 'groupName' => 'gender'];
-    $names['individual_prefix'] = [
-      'newName' => 'prefix_id',
-      'groupName' => 'individual_prefix',
-    ];
-    $names['individual_suffix'] = [
-      'newName' => 'suffix_id',
-      'groupName' => 'individual_suffix',
-    ];
-    $names['communication_style'] = [
-      'newName' => 'communication_style_id',
-      'groupName' => 'communication_style',
-    ];
-    $names['addressee'] = [
-      'newName' => 'addressee_id',
-      'groupName' => 'addressee',
-    ];
-    $names['email_greeting'] = [
-      'newName' => 'email_greeting_id',
-      'groupName' => 'email_greeting',
-    ];
-    $names['postal_greeting'] = [
-      'newName' => 'postal_greeting_id',
-      'groupName' => 'postal_greeting',
-    ];
-    CRM_Core_OptionGroup::lookupValues($submitted, $names, TRUE);
-
     if (!isset($submitted)) {
       $submitted = [];
     }
-- 
2.25.1