set contact type for map fields

diff --git a/CRM/Contact/Import/Form/MapField.php b/CRM/Contact/Import/Form/MapField.php
index 5702c33920a7683cde65c6b12b802c8e865b1f2d..0e81b57df197945da1cae2c516e5a836cbd7349d 100644 (file)
--- 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 b87ccae753be8672e9da13535cabf956915e1b90..3ba55c5f48e9d58d5b8522e1e0443cd4cec1b9c7 100644 (file)
--- 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
    *