From fac14ac5fd56f3e40c74b0839b8ed5bf4ebdc70c Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Mon, 20 Sep 2021 08:29:47 +1200
Subject: [PATCH] Enotice fixes in tpls

---
 templates/CRM/Campaign/Form/addCampaignToComponent.tpl | 4 +++-
 templates/CRM/Contribute/Form/Selector.tpl             | 2 +-
 templates/CRM/Contribute/Page/ContributionTotals.tpl   | 8 ++++----
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/templates/CRM/Campaign/Form/addCampaignToComponent.tpl b/templates/CRM/Campaign/Form/addCampaignToComponent.tpl
index 791817b462..d92963147b 100644
--- a/templates/CRM/Campaign/Form/addCampaignToComponent.tpl
+++ b/templates/CRM/Campaign/Form/addCampaignToComponent.tpl
@@ -6,7 +6,9 @@
   <tr class="{$campaignTrClass}">
     {assign var=elementName value=$campaignInfo.elementName}
     <td class="{$campaignTdClass}">
-      {$form.$elementName.label} {$form.$elementName.html}
+      {if isset($form.$elementName)}
+        {$form.$elementName.label} {$form.$elementName.html}
+      {/if}
     </td>
   </tr>
 
diff --git a/templates/CRM/Contribute/Form/Selector.tpl b/templates/CRM/Contribute/Form/Selector.tpl
index dde319b318..ae1f74a2b3 100644
--- a/templates/CRM/Contribute/Form/Selector.tpl
+++ b/templates/CRM/Contribute/Form/Selector.tpl
@@ -22,7 +22,7 @@
       {/if}
       {foreach from=$columnHeaders item=header}
         <th scope="col">
-          {if $header.sort}
+          {if isset($header.sort)}
             {assign var='key' value=$header.sort}
             {$sort->_response.$key.link}
           {else}
diff --git a/templates/CRM/Contribute/Page/ContributionTotals.tpl b/templates/CRM/Contribute/Page/ContributionTotals.tpl
index fb98957a59..0a105df777 100644
--- a/templates/CRM/Contribute/Page/ContributionTotals.tpl
+++ b/templates/CRM/Contribute/Page/ContributionTotals.tpl
@@ -8,10 +8,10 @@
  +--------------------------------------------------------------------+
 *}
 {*Table displays contribution totals for a contact or search result-set *}
-{if $annual.count OR $contributionSummary.total.count OR $contributionSummary.cancel.count OR $contributionSummary.soft_credit.count}
+{if !empty($annual.count) OR $contributionSummary.total.count OR $contributionSummary.cancel.count OR $contributionSummary.soft_credit.count}
     <table class="form-layout-compressed">
 
-    {if $annual.count}
+    {if !empty($annual.count)}
         <tr>
             <th class="contriTotalLeft right">{ts}Current Year-to-Date{/ts} &ndash; {$annual.amount}</th>
             <th class="right"> &nbsp; {ts}# Completed Contributions{/ts} &ndash; {$annual.count}</th>
@@ -29,11 +29,11 @@
             <th class="right"> &nbsp; {ts}# Completed{/ts} &ndash; {$contributionSummary.total.count}</th>
             <th class="right contriTotalRight"> &nbsp; {ts}Avg{/ts} &ndash; {$contributionSummary.total.avg}</th>
           {/if}
-          {if $contributionSummary.cancel.amount}
+          {if isset($contributionSummary.cancel.amount)}
             <th class="disabled right contriTotalRight"> &nbsp; {ts}Cancelled/Refunded{/ts} &ndash; {$contributionSummary.cancel.amount}</th>
           {/if}
       </tr>
-      {if $contributionSummary.soft_credit.count}
+      {if isset($contributionSummary.soft_credit.count)}
         {include file="CRM/Contribute/Page/ContributionSoftTotals.tpl" softCreditTotals=$contributionSummary.soft_credit}
       {/if}
     {/if}
-- 
2.25.1