From 070138639bdce82ad52f2bccfe0ffb184b8faa98 Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Wed, 1 Dec 2021 10:38:00 +1300
Subject: [PATCH] Another isset bites the dust

---
 CRM/Event/Page/EventInfo.php           | 1 +
 templates/CRM/Event/Page/EventInfo.tpl | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CRM/Event/Page/EventInfo.php b/CRM/Event/Page/EventInfo.php
index 5dcac3363f..ed29d62e1c 100644
--- a/CRM/Event/Page/EventInfo.php
+++ b/CRM/Event/Page/EventInfo.php
@@ -145,6 +145,7 @@ class CRM_Event_Page_EventInfo extends CRM_Core_Page {
               }
               else {
                 $values['feeBlock']['value'][$fieldCnt] = $optionVal['amount'];
+                $values['feeBlock']['tax_amount'][$fieldCnt] = 0;
               }
               $values['feeBlock']['label'][$fieldCnt] = $optionVal['label'];
               $values['feeBlock']['lClass'][$fieldCnt] = $labelClass;
diff --git a/templates/CRM/Event/Page/EventInfo.tpl b/templates/CRM/Event/Page/EventInfo.tpl
index 4b858973e4..36bb493ccc 100644
--- a/templates/CRM/Event/Page/EventInfo.tpl
+++ b/templates/CRM/Event/Page/EventInfo.tpl
@@ -188,7 +188,7 @@
                           <td class="{$lClass} crm-event-label">{$feeBlock.label.$idx}</td>
                           {if $isPriceSet & $feeBlock.isDisplayAmount.$idx}
             <td class="fee_amount-value right">
-                              {if isset($feeBlock.tax_amount.$idx)}
+                              {if $feeBlock.tax_amount && $feeBlock.tax_amount.$idx}
           {$feeBlock.value.$idx}
                               {else}
                 {$feeBlock.value.$idx|crmMoney}
-- 
2.25.1