From 5a8206b4884a3075b90c072ccdb6b8d52048bb43 Mon Sep 17 00:00:00 2001 From: Eileen McNaughton Date: Tue, 10 Jan 2023 08:25:59 +1300 Subject: [PATCH] Remove _columnCount from Contact MapField --- CRM/Contact/Import/Form/MapField.php | 3 +-- CRM/Import/Form/MapField.php | 7 ------- CRM/Import/Forms.php | 1 - 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/CRM/Contact/Import/Form/MapField.php b/CRM/Contact/Import/Form/MapField.php index 5a8b5d0cdc..23bf221dc6 100644 --- a/CRM/Contact/Import/Form/MapField.php +++ b/CRM/Contact/Import/Form/MapField.php @@ -277,9 +277,8 @@ class CRM_Contact_Import_Form_MapField extends CRM_Import_Form_MapField { $processor->setContactSubType($this->getSubmittedValue('contactSubType')); $mapper = $this->getSubmittedValue('mapper'); - for ($i = 0; $i < $this->_columnCount; $i++) { + foreach ($this->getColumnHeaders() as $i => $columnHeader) { $sel = &$this->addElement('hierselect', "mapper[$i]", ts('Mapper for Field %1', [1 => $i]), NULL); - $last_key = 0; // Don't set any defaults if we are going to the next page. // ... or coming back. diff --git a/CRM/Import/Form/MapField.php b/CRM/Import/Form/MapField.php index 476d632ed9..6ac7669e24 100644 --- a/CRM/Import/Form/MapField.php +++ b/CRM/Import/Form/MapField.php @@ -38,13 +38,6 @@ abstract class CRM_Import_Form_MapField extends CRM_Import_Forms { */ protected $_mapperFields; - /** - * Number of columns in import file - * - * @var int - */ - protected $_columnCount; - /** * Column headers, if we have them * diff --git a/CRM/Import/Forms.php b/CRM/Import/Forms.php index 6a8ca109c4..0c609c055d 100644 --- a/CRM/Import/Forms.php +++ b/CRM/Import/Forms.php @@ -678,7 +678,6 @@ class CRM_Import_Forms extends CRM_Core_Form { */ protected function assignMapFieldVariables(): void { $this->addExpectedSmartyVariables(['highlightedRelFields', 'initHideBoxes']); - $this->_columnCount = $this->getNumberOfColumns(); $this->_columnNames = $this->getColumnHeaders(); $this->_dataValues = array_values($this->getDataRows([], 2)); $this->assign('columnNames', $this->getColumnHeaders()); -- 2.25.1