From d00da8844cd3ae889e4e6f7c8a1803d6c687d985 Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Thu, 26 May 2022 19:25:32 +1200
Subject: [PATCH] Use 'getParser' rathe than name the parser

---
 CRM/Contact/Import/Form/Preview.php | 8 +++++---
 CRM/Import/Forms.php                | 3 +--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/CRM/Contact/Import/Form/Preview.php b/CRM/Contact/Import/Form/Preview.php
index 6e34b5657a..3bf15b4ea2 100644
--- a/CRM/Contact/Import/Form/Preview.php
+++ b/CRM/Contact/Import/Form/Preview.php
@@ -245,9 +245,11 @@ class CRM_Contact_Import_Form_Preview extends CRM_Import_Form_Preview {
    * @return \CRM_Contact_Import_Parser_Contact
    */
   protected function getParser(): CRM_Contact_Import_Parser_Contact {
-    $parser = new CRM_Contact_Import_Parser_Contact();
-    $parser->setUserJobID($this->getUserJobID());
-    return $parser;
+    if (!$this->parser) {
+      $this->parser = new CRM_Contact_Import_Parser_Contact();
+      $this->parser->setUserJobID($this->getUserJobID());
+    }
+    return $this->parser;
   }
 
 }
diff --git a/CRM/Import/Forms.php b/CRM/Import/Forms.php
index 822fc5d5f1..6c61172567 100644
--- a/CRM/Import/Forms.php
+++ b/CRM/Import/Forms.php
@@ -579,8 +579,7 @@ class CRM_Import_Forms extends CRM_Core_Form {
    */
   protected function getMappedFieldLabels(): array {
     $mapper = [];
-    $parser = new CRM_Contact_Import_Parser_Contact();
-    $parser->setUserJobID($this->getUserJobID());
+    $parser = $this->getParser();
     foreach ($this->getSubmittedValue('mapper') as $columnNumber => $mappedField) {
       $mapper[$columnNumber] = $parser->getMappedFieldLabel($parser->getMappingFieldFromMapperInput($mappedField, 0, $columnNumber));
     }
-- 
2.25.1