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] 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 0b445d8457..81bb8ef455 100644
--- a/CRM/Contact/Import/Form/MapField.php
+++ b/CRM/Contact/Import/Form/MapField.php
@@ -866,19 +866,14 @@ class CRM_Contact_Import_Form_MapField extends CRM_Import_Form_MapField {
         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";
         }
-- 
2.25.1