From faf1363186a1c4393d8f39771d29e984999d56fa Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Sat, 25 Feb 2023 10:19:08 +1300
Subject: [PATCH] Fix e-notice pattern around location not defined in
 formButtons.tpl

---
 ext/civigrant/templates/CRM/Grant/Form/Task/Delete.tpl        | 2 +-
 .../CRM/Contact/Form/Search/Custom/MultipleValuesCriteria.tpl | 2 +-
 templates/CRM/Admin/Form/ParticipantStatusType.tpl            | 2 +-
 templates/CRM/Admin/Form/Setting/Smtp.tpl                     | 2 +-
 templates/CRM/Batch/Form/Search.tpl                           | 2 +-
 templates/CRM/Contact/Form/Inline/Address.tpl                 | 2 +-
 .../CRM/Contact/Form/Inline/CommunicationPreferences.tpl      | 2 +-
 templates/CRM/Contact/Form/Inline/ContactInfo.tpl             | 2 +-
 templates/CRM/Contact/Form/Inline/ContactName.tpl             | 2 +-
 templates/CRM/Contact/Form/Inline/CustomData.tpl              | 2 +-
 templates/CRM/Contact/Form/Inline/Demographics.tpl            | 2 +-
 templates/CRM/Contact/Form/Inline/Email.tpl                   | 2 +-
 templates/CRM/Contact/Form/Inline/IM.tpl                      | 2 +-
 templates/CRM/Contact/Form/Inline/OpenID.tpl                  | 2 +-
 templates/CRM/Contact/Form/Inline/Phone.tpl                   | 2 +-
 templates/CRM/Contact/Form/Inline/Website.tpl                 | 2 +-
 templates/CRM/Contact/Form/Task/AddToParentClass.tpl          | 2 +-
 templates/CRM/Contact/Form/Task/Delete.tpl                    | 2 +-
 templates/CRM/Contact/Form/Task/PickProfile.tpl               | 2 +-
 templates/CRM/Contact/Form/Task/Unhold.tpl                    | 2 +-
 templates/CRM/Contact/Page/View/Delete.tpl                    | 2 +-
 templates/CRM/Contact/Page/View/Note.tpl                      | 2 +-
 templates/CRM/Contribute/Form/AdditionalPayment.tpl           | 4 ++--
 templates/CRM/Contribute/Form/Contribution.tpl                | 2 +-
 templates/CRM/Contribute/Form/ContributionPage/AddProduct.tpl | 2 +-
 templates/CRM/Contribute/Form/ContributionPage/Delete.tpl     | 2 +-
 templates/CRM/Contribute/Form/SearchContribution.tpl          | 2 +-
 .../CRM/Event/Form/Registration/AdditionalParticipant.tpl     | 2 +-
 templates/CRM/Event/Form/Search.tpl                           | 2 +-
 templates/CRM/Event/Form/SearchEvent.tpl                      | 2 +-
 templates/CRM/Event/Form/Task/Batch.tpl                       | 2 +-
 templates/CRM/Event/Form/Task/Print.tpl                       | 2 +-
 templates/CRM/Event/Form/Task/Result.tpl                      | 2 +-
 templates/CRM/Mailing/Form/Approve.tpl                        | 2 +-
 templates/CRM/Mailing/Form/Component.tpl                      | 2 +-
 templates/CRM/Member/Form/Search.tpl                          | 2 +-
 templates/CRM/Member/Form/Task/Result.tpl                     | 2 +-
 templates/CRM/Price/Form/DeleteSet.tpl                        | 4 ++--
 templates/CRM/Price/Form/Option.tpl                           | 2 +-
 templates/CRM/Profile/Form/Dynamic.tpl                        | 4 ++--
 templates/CRM/Profile/Form/Search.tpl                         | 2 +-
 templates/CRM/SMS/Form/Group.tpl                              | 2 +-
 templates/CRM/SMS/Form/Schedule.tpl                           | 2 +-
 templates/CRM/SMS/Form/Upload.tpl                             | 2 +-
 templates/CRM/UF/Form/Preview.tpl                             | 2 +-
 45 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/ext/civigrant/templates/CRM/Grant/Form/Task/Delete.tpl b/ext/civigrant/templates/CRM/Grant/Form/Task/Delete.tpl
index 85f3168b06..be3e263e63 100644
--- a/ext/civigrant/templates/CRM/Grant/Form/Task/Delete.tpl
+++ b/ext/civigrant/templates/CRM/Grant/Form/Task/Delete.tpl
@@ -14,5 +14,5 @@
           {ts}Are you sure you want to delete the selected Grants? This delete operation cannot be undone and will delete all transactions associated with these grants.{/ts}
           <p>{include file="CRM/Grant/Form/Task.tpl"}</p>
   </div>
-  <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl"}</div>
+  <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location=''}</div>
 </div>
diff --git a/ext/legacycustomsearches/templates/CRM/Contact/Form/Search/Custom/MultipleValuesCriteria.tpl b/ext/legacycustomsearches/templates/CRM/Contact/Form/Search/Custom/MultipleValuesCriteria.tpl
index 3326b6fbfd..1b3ab635b7 100644
--- a/ext/legacycustomsearches/templates/CRM/Contact/Form/Search/Custom/MultipleValuesCriteria.tpl
+++ b/ext/legacycustomsearches/templates/CRM/Contact/Form/Search/Custom/MultipleValuesCriteria.tpl
@@ -86,7 +86,7 @@
                 </div>
             </div>
 
-        <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl"}</div>
+        <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location=''}</div>
     </div><!-- /.crm-accordion-body -->
     </div><!-- /.crm-accordion-wrapper -->
 </div><!-- /.crm-form-block -->
diff --git a/templates/CRM/Admin/Form/ParticipantStatusType.tpl b/templates/CRM/Admin/Form/ParticipantStatusType.tpl
index b7afd0d559..89508dfc70 100644
--- a/templates/CRM/Admin/Form/ParticipantStatusType.tpl
+++ b/templates/CRM/Admin/Form/ParticipantStatusType.tpl
@@ -18,7 +18,7 @@
        {icon icon="fa-info-circle"}{/icon}
              {ts}WARNING: Deleting this Participant Status will remove all of its settings.{/ts} {ts}Do you want to continue?{/ts}
        </div>
-      <div>{include file="CRM/common/formButtons.tpl"}
+      <div>{include file="CRM/common/formButtons.tpl" location=''}
       </div>
     {else}
       <table class="form-layout-compressed">
diff --git a/templates/CRM/Admin/Form/Setting/Smtp.tpl b/templates/CRM/Admin/Form/Setting/Smtp.tpl
index 9df670fd0e..83c2485186 100644
--- a/templates/CRM/Admin/Form/Setting/Smtp.tpl
+++ b/templates/CRM/Admin/Form/Setting/Smtp.tpl
@@ -85,7 +85,7 @@
         </div>
         <div class="spacer"></div>
         <div class="crm-submit-buttons">
-            {include file="CRM/common/formButtons.tpl"}
+            {include file="CRM/common/formButtons.tpl" location=''}
         </div>
 
 {literal}
diff --git a/templates/CRM/Batch/Form/Search.tpl b/templates/CRM/Batch/Form/Search.tpl
index dd1379ebdd..66054c2c9c 100644
--- a/templates/CRM/Batch/Form/Search.tpl
+++ b/templates/CRM/Batch/Form/Search.tpl
@@ -17,7 +17,7 @@
         {ts}Complete OR partial batch name.{/ts}
         </span>
       </td>
-      <td>{include file="CRM/common/formButtons.tpl"}</td>
+      <td>{include file="CRM/common/formButtons.tpl" location=''}</td>
     </tr>
   </table>
 </div>
diff --git a/templates/CRM/Contact/Form/Inline/Address.tpl b/templates/CRM/Contact/Form/Inline/Address.tpl
index 56bb901e23..2a9ceebcea 100644
--- a/templates/CRM/Contact/Form/Inline/Address.tpl
+++ b/templates/CRM/Contact/Form/Inline/Address.tpl
@@ -13,7 +13,7 @@
     <tr>
       <td>
         <div class="crm-submit-buttons">
-          {include file="CRM/common/formButtons.tpl"}
+          {include file="CRM/common/formButtons.tpl" location=''}
           {if $addressId}
             &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
             <a class="button delete-button" href="#" style="display:inline-block;float:none;"><div class="icon delete-icon"></div> {ts}Delete{/ts}</a>
diff --git a/templates/CRM/Contact/Form/Inline/CommunicationPreferences.tpl b/templates/CRM/Contact/Form/Inline/CommunicationPreferences.tpl
index ccefcd6809..eda461fe0d 100644
--- a/templates/CRM/Contact/Form/Inline/CommunicationPreferences.tpl
+++ b/templates/CRM/Contact/Form/Inline/CommunicationPreferences.tpl
@@ -13,7 +13,7 @@
 
  <div class="crm-inline-edit-form">
     <div class="crm-inline-button">
-      {include file="CRM/common/formButtons.tpl"}
+      {include file="CRM/common/formButtons.tpl" location=''}
     </div>
     <div class="crm-clear">
       {foreach key=key item=item from=$commPreference}
diff --git a/templates/CRM/Contact/Form/Inline/ContactInfo.tpl b/templates/CRM/Contact/Form/Inline/ContactInfo.tpl
index f9efa336c4..137bd07e51 100644
--- a/templates/CRM/Contact/Form/Inline/ContactInfo.tpl
+++ b/templates/CRM/Contact/Form/Inline/ContactInfo.tpl
@@ -10,7 +10,7 @@
 {$form.oplock_ts.html}
 <div class="crm-inline-edit-form">
   <div class="crm-inline-button">
-    {include file="CRM/common/formButtons.tpl"}
+    {include file="CRM/common/formButtons.tpl" location=''}
   </div>
 
   <div class="crm-clear">
diff --git a/templates/CRM/Contact/Form/Inline/ContactName.tpl b/templates/CRM/Contact/Form/Inline/ContactName.tpl
index 021cff1c51..6b9aacfde0 100644
--- a/templates/CRM/Contact/Form/Inline/ContactName.tpl
+++ b/templates/CRM/Contact/Form/Inline/ContactName.tpl
@@ -11,7 +11,7 @@
 {$form.oplock_ts.html}
 <div class="crm-inline-edit-form">
   <div class="crm-inline-button">
-    {include file="CRM/common/formButtons.tpl"}
+    {include file="CRM/common/formButtons.tpl" location=''}
   </div>
   {crmRegion name="contact-form-inline-contactname"}
     {if $contactType eq 'Individual'}
diff --git a/templates/CRM/Contact/Form/Inline/CustomData.tpl b/templates/CRM/Contact/Form/Inline/CustomData.tpl
index 43961f65ca..0d3929be13 100644
--- a/templates/CRM/Contact/Form/Inline/CustomData.tpl
+++ b/templates/CRM/Contact/Form/Inline/CustomData.tpl
@@ -11,7 +11,7 @@
 {$form.oplock_ts.html}
 <div class="crm-inline-edit-form">
   <div class="crm-inline-button">
-    {include file="CRM/common/formButtons.tpl"}
+    {include file="CRM/common/formButtons.tpl" location=''}
   </div>
   {include file="CRM/Custom/Form/CustomData.tpl" skipTitle=true}
 </div> <!-- end of main -->
diff --git a/templates/CRM/Contact/Form/Inline/Demographics.tpl b/templates/CRM/Contact/Form/Inline/Demographics.tpl
index a26dedfe54..e4e8f2e701 100644
--- a/templates/CRM/Contact/Form/Inline/Demographics.tpl
+++ b/templates/CRM/Contact/Form/Inline/Demographics.tpl
@@ -10,7 +10,7 @@
 {$form.oplock_ts.html}
 <div class="crm-inline-edit-form">
   <div class="crm-inline-button">
-    {include file="CRM/common/formButtons.tpl"}
+    {include file="CRM/common/formButtons.tpl" location=''}
   </div>
 
   <div class="crm-clear">
diff --git a/templates/CRM/Contact/Form/Inline/Email.tpl b/templates/CRM/Contact/Form/Inline/Email.tpl
index b4b11bc728..e84a752511 100644
--- a/templates/CRM/Contact/Form/Inline/Email.tpl
+++ b/templates/CRM/Contact/Form/Inline/Email.tpl
@@ -13,7 +13,7 @@
   <tr>
     <td colspan="5">
       <div class="crm-submit-buttons">
-        {include file="CRM/common/formButtons.tpl"}
+        {include file="CRM/common/formButtons.tpl" location=''}
       </div>
     </td>
   </tr>
diff --git a/templates/CRM/Contact/Form/Inline/IM.tpl b/templates/CRM/Contact/Form/Inline/IM.tpl
index e76a1b15dc..5291433fbb 100644
--- a/templates/CRM/Contact/Form/Inline/IM.tpl
+++ b/templates/CRM/Contact/Form/Inline/IM.tpl
@@ -13,7 +13,7 @@
     <tr>
       <td colspan="5">
         <div class="crm-submit-buttons">
-          {include file="CRM/common/formButtons.tpl"}
+          {include file="CRM/common/formButtons.tpl" location=''}
         </div>
       </td>
     </tr>
diff --git a/templates/CRM/Contact/Form/Inline/OpenID.tpl b/templates/CRM/Contact/Form/Inline/OpenID.tpl
index bcb0a09472..7fd73b6118 100644
--- a/templates/CRM/Contact/Form/Inline/OpenID.tpl
+++ b/templates/CRM/Contact/Form/Inline/OpenID.tpl
@@ -13,7 +13,7 @@
   <tr>
     <td colspan="4">
       <div class="crm-submit-buttons">
-        {include file="CRM/common/formButtons.tpl"}
+        {include file="CRM/common/formButtons.tpl" location=''}
       </div>
     </td>
   </tr>
diff --git a/templates/CRM/Contact/Form/Inline/Phone.tpl b/templates/CRM/Contact/Form/Inline/Phone.tpl
index 3e2c3af7c1..fa90b955ce 100644
--- a/templates/CRM/Contact/Form/Inline/Phone.tpl
+++ b/templates/CRM/Contact/Form/Inline/Phone.tpl
@@ -13,7 +13,7 @@
     <tr>
       <td colspan="5">
         <div class="crm-submit-buttons">
-          {include file="CRM/common/formButtons.tpl"}
+          {include file="CRM/common/formButtons.tpl" location=''}
         </div>
       </td>
     </tr>
diff --git a/templates/CRM/Contact/Form/Inline/Website.tpl b/templates/CRM/Contact/Form/Inline/Website.tpl
index e5d5bf5838..f58852cc8d 100644
--- a/templates/CRM/Contact/Form/Inline/Website.tpl
+++ b/templates/CRM/Contact/Form/Inline/Website.tpl
@@ -13,7 +13,7 @@
     <tr>
       <td colspan="5">
         <div class="crm-submit-buttons">
-          {include file="CRM/common/formButtons.tpl"}
+          {include file="CRM/common/formButtons.tpl" location=''}
         </div>
       </td>
     </tr>
diff --git a/templates/CRM/Contact/Form/Task/AddToParentClass.tpl b/templates/CRM/Contact/Form/Task/AddToParentClass.tpl
index a97a336420..c014c75c2a 100644
--- a/templates/CRM/Contact/Form/Task/AddToParentClass.tpl
+++ b/templates/CRM/Contact/Form/Task/AddToParentClass.tpl
@@ -84,7 +84,7 @@
                     <div class="description">
 
                     </div>
-               <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl"}</div>
+               <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location=''}</div>
             </div>
 
 
diff --git a/templates/CRM/Contact/Form/Task/Delete.tpl b/templates/CRM/Contact/Form/Task/Delete.tpl
index 436464f40e..a8b01b8359 100644
--- a/templates/CRM/Contact/Form/Task/Delete.tpl
+++ b/templates/CRM/Contact/Form/Task/Delete.tpl
@@ -22,5 +22,5 @@
 
 
     <h3>{include file="CRM/Contact/Form/Task.tpl"}</h3>
-  <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl"}</div>
+  <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location=''}</div>
 </div>
diff --git a/templates/CRM/Contact/Form/Task/PickProfile.tpl b/templates/CRM/Contact/Form/Task/PickProfile.tpl
index ddfe7ac4ee..4ddd6cf968 100644
--- a/templates/CRM/Contact/Form/Task/PickProfile.tpl
+++ b/templates/CRM/Contact/Form/Task/PickProfile.tpl
@@ -21,6 +21,6 @@
         </td>
     </tr>
 </table>
-<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl"}</div>
+<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location=''}</div>
 </div>
 
diff --git a/templates/CRM/Contact/Form/Task/Unhold.tpl b/templates/CRM/Contact/Form/Task/Unhold.tpl
index e2f019db57..7012f28248 100644
--- a/templates/CRM/Contact/Form/Task/Unhold.tpl
+++ b/templates/CRM/Contact/Form/Task/Unhold.tpl
@@ -14,5 +14,5 @@
           <p>{ts}Are you sure you want to unhold email of selected contact(s)?.{/ts} {ts}This action cannot be undone.{/ts}</p>
       <p>{include file="CRM/Contact/Form/Task.tpl"}</p>
     </div>
-<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl"}</div>
+<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location=''}</div>
 </div>
diff --git a/templates/CRM/Contact/Page/View/Delete.tpl b/templates/CRM/Contact/Page/View/Delete.tpl
index 5b8c511577..63d60e06b6 100644
--- a/templates/CRM/Contact/Page/View/Delete.tpl
+++ b/templates/CRM/Contact/Page/View/Delete.tpl
@@ -14,4 +14,4 @@
         <p>{ts}This action cannot be undone.{/ts}</p>
 </div>
 <p>
-<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl"}</div>
+<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location=''}</div>
diff --git a/templates/CRM/Contact/Page/View/Note.tpl b/templates/CRM/Contact/Page/View/Note.tpl
index 2ea05f614e..cc11d8e9c2 100644
--- a/templates/CRM/Contact/Page/View/Note.tpl
+++ b/templates/CRM/Contact/Page/View/Note.tpl
@@ -83,7 +83,7 @@
 {/if}
 {if ($action eq 8)}
 <div class=status>{ts 1=$notes.$id.note}Are you sure you want to delete the note '%1'?{/ts}</div>
-<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl"}</div>
+<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location=''}</div>
 
 {/if}
 
diff --git a/templates/CRM/Contribute/Form/AdditionalPayment.tpl b/templates/CRM/Contribute/Form/AdditionalPayment.tpl
index 88f1bdae27..df7c946dba 100644
--- a/templates/CRM/Contribute/Form/AdditionalPayment.tpl
+++ b/templates/CRM/Contribute/Form/AdditionalPayment.tpl
@@ -11,7 +11,7 @@
   {include file="CRM/Contribute/Form/PaymentInfoBlock.tpl"}
   {if !$suppressPaymentFormButtons}
     <div class="crm-submit-buttons">
-       {include file="CRM/common/formButtons.tpl"}
+       {include file="CRM/common/formButtons.tpl" location=''}
     </div>
   {/if}
 {else}
@@ -39,7 +39,7 @@
     {/if}
   {/if}
   <div class="crm-submit-buttons">
-    {include file="CRM/common/formButtons.tpl"}
+    {include file="CRM/common/formButtons.tpl" location=''}
   </div>
   <table class="form-layout-compressed">
     <tr>
diff --git a/templates/CRM/Contribute/Form/Contribution.tpl b/templates/CRM/Contribute/Form/Contribution.tpl
index 1549c4f315..702832d7c1 100644
--- a/templates/CRM/Contribute/Form/Contribution.tpl
+++ b/templates/CRM/Contribute/Form/Contribution.tpl
@@ -56,7 +56,7 @@
       </div>
     {/if}
       <div class="crm-submit-buttons">
-        {include file="CRM/common/formButtons.tpl"}
+        {include file="CRM/common/formButtons.tpl" location=''}
       </div>
       {if !empty($isOnline)}{assign var=valueStyle value=" class='view-value'"}{else}{assign var=valueStyle value=""}{/if}
       <table class="form-layout-compressed">
diff --git a/templates/CRM/Contribute/Form/ContributionPage/AddProduct.tpl b/templates/CRM/Contribute/Form/ContributionPage/AddProduct.tpl
index 3d282628fa..75725faa39 100644
--- a/templates/CRM/Contribute/Form/ContributionPage/AddProduct.tpl
+++ b/templates/CRM/Contribute/Form/ContributionPage/AddProduct.tpl
@@ -52,7 +52,7 @@
   </div>
 {else}
   <div class="crm-done-button">
-      {include file="CRM/common/formButtons.tpl"}
+      {include file="CRM/common/formButtons.tpl" location=''}
   </div>
 {/if} {* $action ne view *}
 </div>
diff --git a/templates/CRM/Contribute/Form/ContributionPage/Delete.tpl b/templates/CRM/Contribute/Form/ContributionPage/Delete.tpl
index 98544852fb..aa7887845d 100644
--- a/templates/CRM/Contribute/Form/ContributionPage/Delete.tpl
+++ b/templates/CRM/Contribute/Form/ContributionPage/Delete.tpl
@@ -17,5 +17,5 @@
         {/if}
       </div>
 <div class="form-item">
-    {include file="CRM/common/formButtons.tpl"}
+    {include file="CRM/common/formButtons.tpl" location=''}
 </div>
diff --git a/templates/CRM/Contribute/Form/SearchContribution.tpl b/templates/CRM/Contribute/Form/SearchContribution.tpl
index ae2d9650ac..a282a719b5 100644
--- a/templates/CRM/Contribute/Form/SearchContribution.tpl
+++ b/templates/CRM/Contribute/Form/SearchContribution.tpl
@@ -34,5 +34,5 @@
     campaignTrClass='' campaignTdClass=''}
 
  </table>
- <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl"}</div>
+ <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location=''}</div>
 </div>
diff --git a/templates/CRM/Event/Form/Registration/AdditionalParticipant.tpl b/templates/CRM/Event/Form/Registration/AdditionalParticipant.tpl
index a38d3f94b8..1c00dbfcc6 100644
--- a/templates/CRM/Event/Form/Registration/AdditionalParticipant.tpl
+++ b/templates/CRM/Event/Form/Registration/AdditionalParticipant.tpl
@@ -55,7 +55,7 @@
 </div>
 
 <div id="crm-submit-buttons" class="crm-submit-buttons">
-    {include file="CRM/common/formButtons.tpl"}
+    {include file="CRM/common/formButtons.tpl" location=''}
 </div>
 </div>
 
diff --git a/templates/CRM/Event/Form/Search.tpl b/templates/CRM/Event/Form/Search.tpl
index b89051349c..bd75709472 100644
--- a/templates/CRM/Event/Form/Search.tpl
+++ b/templates/CRM/Event/Form/Search.tpl
@@ -24,7 +24,7 @@
         {include file="CRM/Event/Form/Search/Common.tpl"}
 
         <tr>
-           <td colspan="2">{include file="CRM/common/formButtons.tpl"}</td>
+           <td colspan="2">{include file="CRM/common/formButtons.tpl" location=''}</td>
         </tr>
         </table>
     {/strip}
diff --git a/templates/CRM/Event/Form/SearchEvent.tpl b/templates/CRM/Event/Form/SearchEvent.tpl
index fb278a55be..fc064e42b9 100644
--- a/templates/CRM/Event/Form/SearchEvent.tpl
+++ b/templates/CRM/Event/Form/SearchEvent.tpl
@@ -47,7 +47,7 @@
     {* campaign in event search *}
     {include file="CRM/Campaign/Form/addCampaignToSearch.tpl"
     campaignTrClass='crm-event-searchevent-form-block-campaign_id' campaignTdClass=''}
-    <td class="right">{include file="CRM/common/formButtons.tpl"}</td>
+    <td class="right">{include file="CRM/common/formButtons.tpl" location=''}</td>
   </table>
     </div>
   </div>
diff --git a/templates/CRM/Event/Form/Task/Batch.tpl b/templates/CRM/Event/Form/Task/Batch.tpl
index 895ec862e6..27760a6b08 100644
--- a/templates/CRM/Event/Form/Task/Batch.tpl
+++ b/templates/CRM/Event/Form/Task/Batch.tpl
@@ -93,7 +93,7 @@
            </tr>
          </table>
 <div class="crm-submit-buttons">
-{if $fields}{$form._qf_Batch_refresh.html}{/if}{include file="CRM/common/formButtons.tpl"}
+{if $fields}{$form._qf_Batch_refresh.html}{/if}{include file="CRM/common/formButtons.tpl" location=''}
 </div>
 </div>
 
diff --git a/templates/CRM/Event/Form/Task/Print.tpl b/templates/CRM/Event/Form/Task/Print.tpl
index 689580967b..a321e22098 100644
--- a/templates/CRM/Event/Form/Task/Print.tpl
+++ b/templates/CRM/Event/Form/Task/Print.tpl
@@ -54,7 +54,7 @@
 </table>
 
 <div class="form-item">
-     <span class="element-right">{include file="CRM/common/formButtons.tpl"}</span>
+     <span class="element-right">{include file="CRM/common/formButtons.tpl" location=''}</span>
 </div>
 
 {else}
diff --git a/templates/CRM/Event/Form/Task/Result.tpl b/templates/CRM/Event/Form/Task/Result.tpl
index ccd03315d4..755e964d0e 100644
--- a/templates/CRM/Event/Form/Task/Result.tpl
+++ b/templates/CRM/Event/Form/Task/Result.tpl
@@ -9,6 +9,6 @@
 *}
 <div class='spacer'></div>
 <div class="crm-submit-buttons">
-     {include file="CRM/common/formButtons.tpl"}
+     {include file="CRM/common/formButtons.tpl" location=''}
 </div>
 
diff --git a/templates/CRM/Mailing/Form/Approve.tpl b/templates/CRM/Mailing/Form/Approve.tpl
index 2cc127b950..18e4779649 100644
--- a/templates/CRM/Mailing/Form/Approve.tpl
+++ b/templates/CRM/Mailing/Form/Approve.tpl
@@ -22,7 +22,7 @@
     </tr>
   </tbody>
 </table>
-<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl"}</div>
+<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location=''}</div>
 
 <div class="crm-accordion-wrapper crm-plain_text_email-accordion collapsed">
     <div class="crm-accordion-header">
diff --git a/templates/CRM/Mailing/Form/Component.tpl b/templates/CRM/Mailing/Form/Component.tpl
index d176406c02..ab135483bb 100644
--- a/templates/CRM/Mailing/Form/Component.tpl
+++ b/templates/CRM/Mailing/Form/Component.tpl
@@ -20,5 +20,5 @@
     <tr class="crm-mailing-component-form-block-is_active"><td class="label">{$form.is_active.label}</td><td>{$form.is_active.html}</td>
   </table>
 </fieldset>
-<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl"}</div>
+<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location=''}</div>
 </div>
diff --git a/templates/CRM/Member/Form/Search.tpl b/templates/CRM/Member/Form/Search.tpl
index 7db4c4bfc8..20b9294115 100644
--- a/templates/CRM/Member/Form/Search.tpl
+++ b/templates/CRM/Member/Form/Search.tpl
@@ -19,7 +19,7 @@
           {include file="CRM/Member/Form/Search/Common.tpl"}
 
           <tr>
-              <td colspan="2">{include file="CRM/common/formButtons.tpl"}</td>
+              <td colspan="2">{include file="CRM/common/formButtons.tpl" location=''}</td>
           </tr>
       </table>
   {/strip}
diff --git a/templates/CRM/Member/Form/Task/Result.tpl b/templates/CRM/Member/Form/Task/Result.tpl
index d3017428f4..a7b04880d9 100644
--- a/templates/CRM/Member/Form/Task/Result.tpl
+++ b/templates/CRM/Member/Form/Task/Result.tpl
@@ -10,7 +10,7 @@
 <div class='spacer'></div>
 <div class="form-item">
     <p>
-    {include file="CRM/common/formButtons.tpl"}
+    {include file="CRM/common/formButtons.tpl" location=''}
     </p>
 </div>
 
diff --git a/templates/CRM/Price/Form/DeleteSet.tpl b/templates/CRM/Price/Form/DeleteSet.tpl
index a53d480358..4dd00ba129 100644
--- a/templates/CRM/Price/Form/DeleteSet.tpl
+++ b/templates/CRM/Price/Form/DeleteSet.tpl
@@ -11,9 +11,9 @@
     <div class="messages status no-popup">
      <img src="{$config->resourceBase}i/Inform.gif" alt="{ts}status{/ts}"/>
           {ts 1=$title}WARNING: Deleting this price set will result in the loss of all '%1' data.{/ts} {ts}This action cannot be undone.{/ts} {ts}Do you want to continue?{/ts}
-       
+
     </div>
 
 <div class="form-item">
-    {include file="CRM/common/formButtons.tpl"}
+    {include file="CRM/common/formButtons.tpl" location=''}
 </div>
diff --git a/templates/CRM/Price/Form/Option.tpl b/templates/CRM/Price/Form/Option.tpl
index 6924efaad0..a7d351009d 100644
--- a/templates/CRM/Price/Form/Option.tpl
+++ b/templates/CRM/Price/Form/Option.tpl
@@ -114,7 +114,7 @@
 
 
   <div class="crm-submit-buttons">
-    {include file="CRM/common/formButtons.tpl"}
+    {include file="CRM/common/formButtons.tpl" location=''}
   </div>
 
 </div>
diff --git a/templates/CRM/Profile/Form/Dynamic.tpl b/templates/CRM/Profile/Form/Dynamic.tpl
index ba9421498c..c35fdce222 100644
--- a/templates/CRM/Profile/Form/Dynamic.tpl
+++ b/templates/CRM/Profile/Form/Dynamic.tpl
@@ -50,7 +50,7 @@
     {if $action eq 2 and $multiRecordFieldListing}
       <h1>{ts}Edit Details{/ts}</h1>
       <div class="crm-submit-buttons" style='float:right'>
-      {include file="CRM/common/formButtons.tpl"}{if $isDuplicate}{$form._qf_Edit_upload_duplicate.html}{/if}
+      {include file="CRM/common/formButtons.tpl" location=''}{if $isDuplicate}{$form._qf_Edit_upload_duplicate.html}{/if}
       </div>
     {/if}
 
@@ -201,7 +201,7 @@
         </div>
       {/if}
       <div class="crm-submit-buttons" style='{$floatStyle}'>
-        {include file="CRM/common/formButtons.tpl"}{if $isDuplicate}{$form._qf_Edit_upload_duplicate.html}{/if}
+        {include file="CRM/common/formButtons.tpl" location=''}{if $isDuplicate}{$form._qf_Edit_upload_duplicate.html}{/if}
         {if $includeCancelButton}
           <a class="button cancel" href="{$cancelURL}">
             <span>
diff --git a/templates/CRM/Profile/Form/Search.tpl b/templates/CRM/Profile/Form/Search.tpl
index 0b093ea450..a0b0f0c46b 100644
--- a/templates/CRM/Profile/Form/Search.tpl
+++ b/templates/CRM/Profile/Form/Search.tpl
@@ -75,7 +75,7 @@
       <tr><td colspan="2">{include file="CRM/Contact/Form/Task/ProximityCommon.tpl"}</td></tr>
     {/if}
 
-    <tr><td></td><td>{include file="CRM/common/formButtons.tpl"}</td></tr>
+    <tr><td></td><td>{include file="CRM/common/formButtons.tpl" location=''}</td></tr>
   </table>
 
   {if $groupId}
diff --git a/templates/CRM/SMS/Form/Group.tpl b/templates/CRM/SMS/Form/Group.tpl
index 2ce5486d8c..3df24931d5 100644
--- a/templates/CRM/SMS/Form/Group.tpl
+++ b/templates/CRM/SMS/Form/Group.tpl
@@ -49,7 +49,7 @@
  </div><!-- /.crm-accordion-body -->
 </div><!-- /.crm-accordion-wrapper -->
 
-  <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl"}</div>
+  <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location=''}</div>
 </div>
 
 </div>
diff --git a/templates/CRM/SMS/Form/Schedule.tpl b/templates/CRM/SMS/Form/Schedule.tpl
index 7e168f26e3..fe5af9ab51 100644
--- a/templates/CRM/SMS/Form/Schedule.tpl
+++ b/templates/CRM/SMS/Form/Schedule.tpl
@@ -24,7 +24,7 @@
   </div>
   <div class="description">{ts}Set a date and time when you want CiviSMS to start sending this Mass SMS.{/ts}</div>
 </div>
-<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl"}</div>
+<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location=''}</div>
 
 {if $preview}
 <div class="crm-accordion-wrapper crm-plain_text_sms-accordion collapsed">
diff --git a/templates/CRM/SMS/Form/Upload.tpl b/templates/CRM/SMS/Form/Upload.tpl
index 617b079582..c9b425d4c5 100644
--- a/templates/CRM/SMS/Form/Upload.tpl
+++ b/templates/CRM/SMS/Form/Upload.tpl
@@ -40,7 +40,7 @@
     </table>
   </fieldset>
 
-  <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl"}</div>
+  <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location=''}</div>
 </div><!-- / .crm-form-block -->
 
 {* -- Javascript for showing/hiding the upload/compose options -- *}
diff --git a/templates/CRM/UF/Form/Preview.tpl b/templates/CRM/UF/Form/Preview.tpl
index 5d01c52e83..056c2b278f 100644
--- a/templates/CRM/UF/Form/Preview.tpl
+++ b/templates/CRM/UF/Form/Preview.tpl
@@ -40,6 +40,6 @@
 {/if} {* fields array is not empty *}
 
   <div class="crm-submit-buttons">
-  {include file="CRM/common/formButtons.tpl"}
+  {include file="CRM/common/formButtons.tpl" location=''}
   </div>
 </div>
-- 
2.25.1