From 47a8acbb33868949ae975aca599c91564ed0ae2c Mon Sep 17 00:00:00 2001 From: eileen Date: Thu, 8 Aug 2019 14:56:00 +1200 Subject: [PATCH] Further e-notice regression fix --- CRM/Contact/Import/Form/MapField.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CRM/Contact/Import/Form/MapField.php b/CRM/Contact/Import/Form/MapField.php index 08f9dd752b..665f16b96c 100644 --- a/CRM/Contact/Import/Form/MapField.php +++ b/CRM/Contact/Import/Form/MapField.php @@ -400,7 +400,7 @@ class CRM_Contact_Import_Form_MapField extends CRM_Import_Form_MapField { $sel = &$this->addElement('hierselect', "mapper[$i]", ts('Mapper for Field %1', [1 => $i]), NULL); if ($this->get('savedMapping')) { - list($mappingName, $key, $defaults, $js) = $this->loadSavedMapping($mappingName, $i, $mappingRelation, $mappingWebsiteType, $mappingLocation, $mappingPhoneType, $mappingImProvider, $defaults, $formName, $js, $hasColumnNames, $dataPatterns, $columnPatterns); + list($mappingName, $defaults, $js) = $this->loadSavedMapping($mappingName, $i, $mappingRelation, $mappingWebsiteType, $mappingLocation, $mappingPhoneType, $mappingImProvider, $defaults, $formName, $js, $hasColumnNames, $dataPatterns, $columnPatterns); } else { $js .= "swapOptions($formName, 'mapper[$i]', 0, 3, 'hs_mapper_0_');\n"; @@ -1001,7 +1001,7 @@ class CRM_Contact_Import_Form_MapField extends CRM_Import_Form_MapField { $defaults["mapper[$i]"] = [$this->defaultFromData($dataPatterns, $i)]; } } - return [$mappingName, $key, $defaults, $js]; + return [$mappingName, $defaults, $js]; } } -- 2.25.1