From d2d3b4e18ee167c8db670b5aa0b168980c7f32bf Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Thu, 5 Sep 2019 14:36:00 +1200
Subject: [PATCH] remove if that no longer makes sense
---
CRM/Contact/Import/Form/MapField.php | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)
diff --git a/CRM/Contact/Import/Form/MapField.php b/CRM/Contact/Import/Form/MapField.php
index 81bb8ef455..8642288ebe 100644
--- a/CRM/Contact/Import/Form/MapField.php
+++ b/CRM/Contact/Import/Form/MapField.php
@@ -858,19 +858,11 @@ class CRM_Contact_Import_Form_MapField extends CRM_Import_Form_MapField {
* @throws \CiviCRM_API3_Exception
*/
public function loadSavedMapping($processor, $mappingName, $i, $defaults, $js, $hasColumnNames, $dataPatterns, $columnPatterns) {
- $jsSet = FALSE;
$formName = $processor->getFormName();
if (isset($mappingName[$i])) {
if ($mappingName[$i] != ts('- do not import -')) {
-
- if ($processor->getRelationshipKey($i)) {
- $defaults["mapper[$i]"] = $processor->getSavedQuickformDefaultsForColumn($i);
- $js = $processor->getQuickFormJSForField($i);
- }
- else {
- $defaults["mapper[$i]"] = $processor->getSavedQuickformDefaultsForColumn($i);
- $js .= $processor->getQuickFormJSForField($i);
- }
+ $defaults["mapper[$i]"] = $processor->getSavedQuickformDefaultsForColumn($i);
+ $js .= $processor->getQuickFormJSForField($i);
}
else {
$defaults["mapper[$i]"] = [];
--
2.25.1