From 0d46885cc6ee8b4829c7b7dc8470cadc24e4b290 Mon Sep 17 00:00:00 2001 From: Eileen McNaughton Date: Mon, 2 May 2022 12:49:55 +1200 Subject: [PATCH] set contact type for map fields --- CRM/Contact/Import/Form/MapField.php | 3 ++- CRM/Import/Parser.php | 10 ++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CRM/Contact/Import/Form/MapField.php b/CRM/Contact/Import/Form/MapField.php index 5702c33920..0e81b57df1 100644 --- a/CRM/Contact/Import/Form/MapField.php +++ b/CRM/Contact/Import/Form/MapField.php @@ -619,9 +619,10 @@ class CRM_Contact_Import_Form_MapField extends CRM_Import_Form_MapField { * @param int $columnNumber * * @return array + * @throws \CRM_Core_Exception */ protected function getMappedField(array $fieldMapping, int $mappingID, int $columnNumber): array { - return (new CRM_Contact_Import_Parser_Contact())->getMappingFieldFromMapperInput($fieldMapping, $mappingID, $columnNumber); + return (new CRM_Contact_Import_Parser_Contact())->setContactType($this->getContactType())->getMappingFieldFromMapperInput($fieldMapping, $mappingID, $columnNumber); } /** diff --git a/CRM/Import/Parser.php b/CRM/Import/Parser.php index b87ccae753..3ba55c5f48 100644 --- a/CRM/Import/Parser.php +++ b/CRM/Import/Parser.php @@ -281,6 +281,16 @@ abstract class CRM_Import_Parser { */ public $_contactType; + /** + * @param string $contactType + * + * @return CRM_Import_Parser + */ + public function setContactType(string $contactType): CRM_Import_Parser { + $this->_contactType = $contactType; + return $this; + } + /** * Contact sub-type * -- 2.25.1