From b58b205341a0d69ee3ef11f7d135d3c16a6c58e2 Mon Sep 17 00:00:00 2001
From: eileenmcnaugton <eileen@fuzion.co.nz>
Date: Wed, 5 Aug 2015 12:35:46 +1200
Subject: [PATCH] CRM-16967 form regressions

---
 templates/CRM/Contribute/Form/Contribution.tpl | 2 +-
 templates/CRM/Member/Form/Membership.tpl       | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/templates/CRM/Contribute/Form/Contribution.tpl b/templates/CRM/Contribute/Form/Contribution.tpl
index c50573f9e4..2c964bde7c 100644
--- a/templates/CRM/Contribute/Form/Contribution.tpl
+++ b/templates/CRM/Contribute/Form/Contribution.tpl
@@ -30,7 +30,7 @@
 {elseif $showAdditionalInfo and $formType }
   {include file="CRM/Contribute/Form/AdditionalInfo/$formType.tpl"}
 {else}
-
+  {include file="CRM/Contribute/Form/AdditionalInfo/Payment.tpl"}
   <div class="crm-block crm-form-block crm-contribution-form-block">
 
   {if !$email and $action neq 8 and $context neq 'standalone'}
diff --git a/templates/CRM/Member/Form/Membership.tpl b/templates/CRM/Member/Form/Membership.tpl
index 32e6a7fa87..8222f118a5 100644
--- a/templates/CRM/Member/Form/Membership.tpl
+++ b/templates/CRM/Member/Form/Membership.tpl
@@ -171,8 +171,9 @@
           </tr>
           <tr class="crm-membership-form-block-record_contribution"><td colspan="2">
             <fieldset id="recordContribution"><legend>{ts}Membership Payment and Receipt{/ts}</legend>
-         {/if}
-        {include file="CRM/Member/Form/MembershipCommon.tpl"}
+
+          {include file="CRM/Member/Form/MembershipCommon.tpl"}
+        {/if}
 
         {if $emailExists and $outBound_option != 2}
           <tr id="send-receipt" class="crm-membership-form-block-send_receipt">
-- 
2.25.1