remove if that no longer makes sense
authoreileen <emcnaughton@wikimedia.org>
Thu, 5 Sep 2019 02:36:00 +0000 (14:36 +1200)
committereileen <emcnaughton@wikimedia.org>
Thu, 5 Sep 2019 03:21:54 +0000 (15:21 +1200)
CRM/Contact/Import/Form/MapField.php

index 81bb8ef4557941c6a394cb57106dd15254cf23b3..8642288ebea1caad1771c22cf2339dc3b6f46dc9 100644 (file)
@@ -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]"] = [];