Merge pull request #19057 from ixiam/dev/core#2173

[civicrm-core.git] / CRM / Contact / Import / Parser.php

diff --git a/CRM/Contact/Import/Parser.php b/CRM/Contact/Import/Parser.php
index a351fa2c31c5d421dabc9c74ccaab785f0ce2729..e6bfd26f2a460de2982afe4aaa18a7eb66ed6f24 100644 (file)
--- 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;
     }