don't show membership block on confirmation page if no membership exists

diff --git a/templates/CRM/Contribute/Form/Contribution/MembershipBlock.tpl b/templates/CRM/Contribute/Form/Contribution/MembershipBlock.tpl
index b77d0ecd700bf56831f139c2a07f2bb69dadedb2..aaa68dad04be491889ec389189ac60b5c6cfa79c 100644 (file)
--- a/templates/CRM/Contribute/Form/Contribution/MembershipBlock.tpl
+++ b/templates/CRM/Contribute/Form/Contribution/MembershipBlock.tpl
@@ -73,14 +73,14 @@
         });
       </script>
     {/literal}
-    {elseif $lineItem and $priceSetID AND !$is_quick_config}
-      {assign var="totalAmount" value=$amount}
-      <div class="header-dark">
-        {ts}Membership Fee{/ts}
-      </div>
-      <div class="display-block">
-        {include file="CRM/Price/Page/LineItem.tpl" context="Membership"}
-      </div>
+{elseif $membershipBlock and $lineItem and $priceSetID AND !$is_quick_config}
+  {assign var="totalAmount" value=$amount}
+  <div class="header-dark">
+    {ts}Membership Fee{/ts}
+  </div>
+  <div class="display-block">
+    {include file="CRM/Price/Page/LineItem.tpl" context="Membership"}
+  </div>
 {elseif $membershipBlock AND !$is_quick_config}
   <div id="membership" class="crm-group membership-group">
     {if $context EQ "makeContribution"}