From 3e7fde979309c5f74b3edfe55fb33ec230746de0 Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Fri, 1 Apr 2022 12:31:05 +1300
Subject: [PATCH] Ensre formType is assigned to the template

---
 CRM/Contribute/Form/Contribution.php | 2 +-
 CRM/Pledge/Form/Pledge.php           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CRM/Contribute/Form/Contribution.php b/CRM/Contribute/Form/Contribution.php
index 694b6b346c..4499623e9d 100644
--- a/CRM/Contribute/Form/Contribution.php
+++ b/CRM/Contribute/Form/Contribution.php
@@ -608,9 +608,9 @@ class CRM_Contribute_Form_Contribution extends CRM_Contribute_Form_AbstractEditP
     $this->assign('allPanes', $allPanes);
 
     $this->addFormRule(['CRM_Contribute_Form_Contribution', 'formRule'], $this);
+    $this->assign('formType', $this->_formType);
 
     if ($this->_formType) {
-      $this->assign('formType', $this->_formType);
       return;
     }
 
diff --git a/CRM/Pledge/Form/Pledge.php b/CRM/Pledge/Form/Pledge.php
index 1f0b15f14e..880ccaa0ba 100644
--- a/CRM/Pledge/Form/Pledge.php
+++ b/CRM/Pledge/Form/Pledge.php
@@ -233,8 +233,8 @@ class CRM_Pledge_Form_Pledge extends CRM_Core_Form {
     $this->assign('allPanes', $allPanes);
     $this->assign('showAdditionalInfo', $showAdditionalInfo);
 
+    $this->assign('formType', $this->_formType);
     if ($this->_formType) {
-      $this->assign('formType', $this->_formType);
       return;
     }
 
-- 
2.25.1