From f90d1eef465d1e6c6c6dae3384d778e32aaa1a80 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Thu, 5 Sep 2019 14:35:22 +1200
Subject: [PATCH 1/2] Remove jsSet & just construct the if better.

jsSet is always TRUE when if ([] != ts('- do not import -')) {

so we don't need it
---
 CRM/Contact/Import/Form/MapField.php | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/CRM/Contact/Import/Form/MapField.php b/CRM/Contact/Import/Form/MapField.php
index 0b445d845756..81bb8ef45579 100644
--- a/CRM/Contact/Import/Form/MapField.php
+++ b/CRM/Contact/Import/Form/MapField.php
@@ -866,19 +866,14 @@ public function loadSavedMapping($processor, $mappingName, $i, $defaults, $js, $
         if ($processor->getRelationshipKey($i)) {
           $defaults["mapper[$i]"] = $processor->getSavedQuickformDefaultsForColumn($i);
           $js = $processor->getQuickFormJSForField($i);
-          $jsSet = TRUE;
         }
         else {
           $defaults["mapper[$i]"] = $processor->getSavedQuickformDefaultsForColumn($i);
           $js .= $processor->getQuickFormJSForField($i);
-
-          $jsSet = TRUE;
         }
       }
       else {
         $defaults["mapper[$i]"] = [];
-      }
-      if (!$jsSet) {
         for ($k = 1; $k < 4; $k++) {
           $js .= "{$formName}['mapper[$i][$k]'].style.display = 'none';\n";
         }

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 2/2] 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 81bb8ef45579..8642288ebea1 100644
--- a/CRM/Contact/Import/Form/MapField.php
+++ b/CRM/Contact/Import/Form/MapField.php
@@ -858,19 +858,11 @@ protected function saveMappingField($mapperKeys, array $saveMapping, string $cTy
    * @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]"] = [];