From 3ad34747c68c9a5de6b6317a13288a0fd57b7f72 Mon Sep 17 00:00:00 2001 From: eileen Date: Mon, 14 Dec 2020 16:08:35 +1300 Subject: [PATCH] Remove unreachable code. The addressee() function doesn't exist so we can be pretty sure it's not being reached --- CRM/Contact/Import/Parser.php | 12 +----------- CRM/Utils/DeprecatedUtils.php | 12 +----------- 2 files changed, 2 insertions(+), 22 deletions(-) diff --git a/CRM/Contact/Import/Parser.php b/CRM/Contact/Import/Parser.php index a351fa2c31..e6bfd26f2a 100644 --- a/CRM/Contact/Import/Parser.php +++ b/CRM/Contact/Import/Parser.php @@ -1040,17 +1040,7 @@ abstract class CRM_Contact_Import_Parser extends CRM_Import_Parser { } if (isset($values['addressee'])) { - if (!empty($params['addressee_id'])) { - $addresseeFilter = [ - 'contact_type' => $params['contact_type'] ?? NULL, - 'greeting_type' => 'addressee', - ]; - $addressee = CRM_Core_PseudoConstant::addressee($addresseeFilter); - $params['addressee'] = $addressee[$params['addressee_id']]; - } - else { - $params['addressee'] = $values['addressee']; - } + $params['addressee'] = $values['addressee']; return TRUE; } diff --git a/CRM/Utils/DeprecatedUtils.php b/CRM/Utils/DeprecatedUtils.php index 074909d28a..c9345e39ad 100644 --- a/CRM/Utils/DeprecatedUtils.php +++ b/CRM/Utils/DeprecatedUtils.php @@ -267,17 +267,7 @@ function _civicrm_api3_deprecated_add_formatted_param(&$values, &$params) { } if (isset($values['addressee'])) { - if (!empty($params['addressee_id'])) { - $addresseeFilter = [ - 'contact_type' => $params['contact_type'] ?? NULL, - 'greeting_type' => 'addressee', - ]; - $addressee = CRM_Core_PseudoConstant::addressee($addresseeFilter); - $params['addressee'] = $addressee[$params['addressee_id']]; - } - else { - $params['addressee'] = $values['addressee']; - } + $params['addressee'] = $values['addressee']; return TRUE; } -- 2.25.1