Merge pull request #23701 from eileenmcnaughton/unused

[civicrm-core.git] / CRM / Import / Form / DataSource.php

diff --git a/CRM/Import/Form/DataSource.php b/CRM/Import/Form/DataSource.php
index 19fea5947c19202fc3ed50c75719d0774a8b1bd8..306fe2d755236bf756056be91e08ce8a535f4e98 100644 (file)
--- a/CRM/Import/Form/DataSource.php
+++ b/CRM/Import/Form/DataSource.php
@@ -63,7 +63,10 @@ abstract class CRM_Import_Form_DataSource extends CRM_Import_Forms {
    */
   public function buildQuickForm() {
     $config = CRM_Core_Config::singleton();
-
+    // When we switch to using the DataSource.tpl used by Contact we can remove this in
+    // favour of the one used by Contact - I was trying to consolidate
+    // first & got stuck on https://github.com/civicrm/civicrm-core/pull/23458
+    $this->add('hidden', 'hidden_dataSource', 'CRM_Import_DataSource_CSV');
     $uploadFileSize = CRM_Utils_Number::formatUnitSize($config->maxFileSize . 'm', TRUE);
 
     //Fetch uploadFileSize from php_ini when $config->maxFileSize is set to "no limit".
@@ -155,7 +158,6 @@ abstract class CRM_Import_Form_DataSource extends CRM_Import_Forms {
    *   Entity to set for paraser currently only for custom import
    */
   protected function submitFileForMapping($parserClassName, $entity = NULL) {
-    $this->controller->resetPage('MapField');
     CRM_Core_Session::singleton()->set('dateTypes', $this->getSubmittedValue('dateFormats'));
     $this->processDatasource();
 
@@ -178,6 +180,7 @@ abstract class CRM_Import_Form_DataSource extends CRM_Import_Forms {
 
     // add all the necessary variables to the form
     $parser->set($this);
+    $this->controller->resetPage('MapField');
   }
 
   /**