From feab3e2e474afa5821d79d731825db2a47e7f113 Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Thu, 12 May 2022 12:37:37 +1200
Subject: [PATCH] Use submittedValues for usps

---
 CRM/Contact/Import/Form/MapField.php | 1 -
 CRM/Contact/Import/Form/Preview.php  | 4 ++--
 CRM/Contact/Import/Form/Summary.php  | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/CRM/Contact/Import/Form/MapField.php b/CRM/Contact/Import/Form/MapField.php
index ed3f59b933..fb5e8c0126 100644
--- a/CRM/Contact/Import/Form/MapField.php
+++ b/CRM/Contact/Import/Form/MapField.php
@@ -111,7 +111,6 @@ class CRM_Contact_Import_Form_MapField extends CRM_Import_Form_MapField {
     $this->_columnCount = $this->getNumberOfColumns();
     $this->_columnNames = $columnNames;
     $this->assign('columnNames', $this->getColumnHeaders());
-    //$this->_columnCount = $this->get( 'columnCount' );
     $this->assign('columnCount', $this->_columnCount);
     $this->_dataValues = array_values($this->getDataRows([], 2));
     $this->assign('dataValues', $this->_dataValues);
diff --git a/CRM/Contact/Import/Form/Preview.php b/CRM/Contact/Import/Form/Preview.php
index 56ab74e7eb..f51f2b5405 100644
--- a/CRM/Contact/Import/Form/Preview.php
+++ b/CRM/Contact/Import/Form/Preview.php
@@ -34,8 +34,8 @@ class CRM_Contact_Import_Form_Preview extends CRM_Import_Form_Preview {
    * @throws \CRM_Core_Exception
    */
   public function preProcess() {
-    $columnNames = $this->get('columnNames');
-    $this->_disableUSPS = $this->get('disableUSPS');
+    $columnNames = $this->getColumnHeaders();
+    $this->_disableUSPS = $this->getSubmittedValue('disableUSPS');
 
     //assign column names
     $this->assign('columnNames', $columnNames);
diff --git a/CRM/Contact/Import/Form/Summary.php b/CRM/Contact/Import/Form/Summary.php
index d82ace038c..8edea24325 100644
--- a/CRM/Contact/Import/Form/Summary.php
+++ b/CRM/Contact/Import/Form/Summary.php
@@ -29,7 +29,7 @@ class CRM_Contact_Import_Form_Summary extends CRM_Import_Form_Summary {
   public function preProcess() {
     // set the error message path to display
     $this->assign('errorFile', $this->get('errorFile'));
-    $onDuplicate = $this->get('onDuplicate');
+    $onDuplicate = $this->getSubmittedValue('onDuplicate');
     $this->assign('dupeError', FALSE);
 
     if ($onDuplicate == CRM_Import_Parser::DUPLICATE_UPDATE) {
-- 
2.25.1