From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Thu, 31 Mar 2022 23:31:05 +0000 (+1300)
Subject: Ensre formType is assigned to the template
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=3e7fde979309c5f74b3edfe55fb33ec230746de0;p=civicrm-core.git

Ensre formType is assigned to the template
---

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;
     }