From e7adaaba9f6e0847fbde6c2e93f490908faf9b4f Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Mon, 21 Jun 2021 10:12:02 -0400
Subject: [PATCH] Fix undefined tpl vars

---
 CRM/Event/Form/Participant.php | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/CRM/Event/Form/Participant.php b/CRM/Event/Form/Participant.php
index ef6af29020..18fa581f86 100644
--- a/CRM/Event/Form/Participant.php
+++ b/CRM/Event/Form/Participant.php
@@ -327,8 +327,8 @@ class CRM_Event_Form_Participant extends CRM_Contribute_Form_AbstractEditPayment
 
     $this->assign('participantMode', $this->_mode);
 
+    $this->assign('showFeeBlock', $this->_showFeeBlock);
     if ($this->_showFeeBlock) {
-      $this->assign('showFeeBlock', TRUE);
       $isMonetary = CRM_Core_DAO::getFieldValue('CRM_Event_DAO_Event', $this->_showFeeBlock, 'is_monetary');
       if ($isMonetary) {
         $this->assign('feeBlockPaid', TRUE);
@@ -358,10 +358,8 @@ class CRM_Event_Form_Participant extends CRM_Contribute_Form_AbstractEditPayment
       return;
     }
 
-    if ($this->_id) {
-      // assign participant id to the template
-      $this->assign('participantId', $this->_id);
-    }
+    // assign participant id to the template
+    $this->assign('participantId', $this->_id);
 
     // when fee amount is included in form
     if (!empty($_POST['hidden_feeblock']) || !empty($_POST['send_receipt'])) {
-- 
2.25.1