Merge pull request #23283 from eileenmcnaughton/import_saved_map
authorTim Otten <totten@civicrm.org>
Fri, 3 Jun 2022 07:11:04 +0000 (00:11 -0700)
committerGitHub <noreply@github.com>
Fri, 3 Jun 2022 07:11:04 +0000 (00:11 -0700)
[REF] Remove handling for non-existent 'savedMapping' field

1  2 
CRM/Contact/Import/Form/MapField.php
CRM/Member/Import/Form/MapField.php

index 39e4ca1dce8d7211325d1136e01d5113fb0bad3d,7a6663124a0fb93912acb5937d5cef82f0d74da9..9a1d3174da9c9663b2ebf2b7d920505fbd416212
@@@ -392,15 -382,11 +392,8 @@@ class CRM_Contact_Import_Form_MapField 
     */
    public function postProcess() {
      $params = $this->controller->exportValues('MapField');
-     //reload the mapfield if load mapping is pressed
-     if (!empty($params['savedMapping'])) {
-       $this->set('savedMapping', $params['savedMapping']);
-       $this->controller->resetPage($this->_name);
-       return;
-     }
      $this->updateUserJobMetadata('submitted_values', $this->getSubmittedValues());
 -    $parser = $this->submit($params);
 -
 -    // add all the necessary variables to the form
 -    $parser->set($this);
 +    $this->submit($params);
    }
  
    /**
Simple merge