From 2dd01461d6f34e248d67e77d2a5b33b7d897d89c Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Thu, 1 Jul 2021 13:20:30 +1200
Subject: [PATCH] Remove references to savedFieldMapping in page 2 of the
 import

I do not believe this is ever assigned and I also don't think it makes sense
if assigned - the first page 'DataSource.tpl' is the one that displays the
option to load a field mapping. This code applies to the second page and
conditionally displays help text which seems to have stopped being true long ago
---
 templates/CRM/Activity/Import/Form/MapField.tpl   | 3 ---
 templates/CRM/Contact/Import/Form/MapField.tpl    | 3 ---
 templates/CRM/Contribute/Import/Form/MapField.tpl | 3 ---
 templates/CRM/Event/Import/Form/MapField.tpl      | 3 ---
 templates/CRM/Member/Import/Form/MapField.tpl     | 3 ---
 5 files changed, 15 deletions(-)

diff --git a/templates/CRM/Activity/Import/Form/MapField.tpl b/templates/CRM/Activity/Import/Form/MapField.tpl
index 2069288a71..d13151f109 100644
--- a/templates/CRM/Activity/Import/Form/MapField.tpl
+++ b/templates/CRM/Activity/Import/Form/MapField.tpl
@@ -16,9 +16,6 @@
 
  <div class="help">
     <p>{ts}Review the values shown below from the first 2 rows of your import file and select the matching CiviCRM database fields from the drop-down lists in the right-hand column. Select '- do not import -' for any columns in the import file that you want ignored.{/ts}</p>
-    {if $savedMapping}
-    <p>{ts}Click 'Load Saved Field Mapping' if data has been previously imported from the same source. You can then select the saved import mapping setup and load it automatically.{/ts}<p>
-    {/if}
     <p>{ts}If you think you may be importing additional data from the same data source, check 'Save this field mapping' at the bottom of the page before continuing. The saved mapping can then be easily reused the next time data is imported.{/ts}</p>
 </div>
 <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
diff --git a/templates/CRM/Contact/Import/Form/MapField.tpl b/templates/CRM/Contact/Import/Form/MapField.tpl
index 39da860cd7..1a3924b878 100644
--- a/templates/CRM/Contact/Import/Form/MapField.tpl
+++ b/templates/CRM/Contact/Import/Form/MapField.tpl
@@ -15,9 +15,6 @@
  {include file="CRM/common/WizardHeader.tpl"}
 <div class="help">
     <p>{ts}Review the values shown below from the first 2 rows of your import file and select the matching CiviCRM database fields from the drop-down lists in the right-hand column. Select '- do not import -' for any columns in the import file that you want ignored.{/ts}</p>
-    {if $savedMapping}
-    <p>{ts}Click 'Load Saved Field Mapping' if data has been previously imported from the same source. You can then select the saved import mapping setup and load it automatically.{/ts}</p>
-    {/if}
     <p>{ts}If you think you may be importing additional data from the same data source, check 'Save this field mapping' at the bottom of the page before continuing. The saved mapping can then be easily reused the next time data is imported.{/ts}</p>
 </div>
 <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
diff --git a/templates/CRM/Contribute/Import/Form/MapField.tpl b/templates/CRM/Contribute/Import/Form/MapField.tpl
index 677f5c5a2a..a1b0771421 100644
--- a/templates/CRM/Contribute/Import/Form/MapField.tpl
+++ b/templates/CRM/Contribute/Import/Form/MapField.tpl
@@ -15,9 +15,6 @@
 
  <div class="help">
     <p>{ts}Review the values shown below from the first 2 rows of your import file and select the matching CiviCRM database fields from the drop-down lists in the right-hand column. Select '- do not import -' for any columns in the import file that you want ignored.{/ts}</p>
-    {if $savedMapping}
-    <p>{ts}Click 'Load Saved Field Mapping' if data has been previously imported from the same source. You can then select the saved import mapping setup and load it automatically.{/ts}<p>
-    {/if}
     <p>{ts}If you think you may be importing additional data from the same data source, check 'Save this field mapping' at the bottom of the page before continuing. The saved mapping can then be easily reused the next time data is imported.{/ts}</p>
 </div>
 <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
diff --git a/templates/CRM/Event/Import/Form/MapField.tpl b/templates/CRM/Event/Import/Form/MapField.tpl
index 1933bcef3d..ee59d346b9 100644
--- a/templates/CRM/Event/Import/Form/MapField.tpl
+++ b/templates/CRM/Event/Import/Form/MapField.tpl
@@ -14,9 +14,6 @@
 {include file="CRM/common/WizardHeader.tpl"}
 <div class="help">
     <p>{ts}Review the values shown below from the first 2 rows of your import file and select the matching CiviCRM database fields from the drop-down lists in the right-hand column. Select '- do not import -' for any columns in the import file that you want ignored.{/ts}</p>
-    {if $savedMapping}
-    <p>{ts}Click 'Load Saved Field Mapping' if data has been previously imported from the same source. You can then select the saved import mapping setup and load it automatically.{/ts}<p>
-    {/if}
     <p>{ts}If you think you may be importing additional data from the same data source, check 'Save this field mapping' at the bottom of the page before continuing. The saved mapping can then be easily reused the next time data is imported.{/ts}</p>
 </div>
 
diff --git a/templates/CRM/Member/Import/Form/MapField.tpl b/templates/CRM/Member/Import/Form/MapField.tpl
index a4a1338eb3..de00b4c9a0 100644
--- a/templates/CRM/Member/Import/Form/MapField.tpl
+++ b/templates/CRM/Member/Import/Form/MapField.tpl
@@ -12,9 +12,6 @@
 {include file="CRM/common/WizardHeader.tpl"}
 <div class="help">
     <p>{ts}Review the values shown below from the first 2 rows of your import file and select the matching CiviCRM database fields from the drop-down lists in the right-hand column. Select '- do not import -' for any columns in the import file that you want ignored.{/ts}</p>
-    {if $savedMapping}
-    <p>{ts}Click 'Load Saved Field Mapping' if data has been previously imported from the same source. You can then select the saved import mapping setup and load it automatically.{/ts}<p>
-    {/if}
     <p>{ts}If you think you may be importing additional data from the same data source, check 'Save this field mapping' at the bottom of the page before continuing. The saved mapping can then be easily reused the next time data is imported.{/ts}</p>
 </div>
 <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
-- 
2.25.1