From 0d791f3bd85abc334760861ed5c6778067ab6c0d Mon Sep 17 00:00:00 2001
From: Jon goldberg <jon@palantetech.coop>
Date: Wed, 11 Nov 2015 19:32:54 -0500
Subject: [PATCH] CRM-17522 - CiviMember - support using membership price sets
 on contribution pages without requiring selecting a membership option

---
 CRM/Contribute/Form/Contribution/Main.php     | 2 +-
 templates/CRM/Member/Form/MembershipBlock.tpl | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/CRM/Contribute/Form/Contribution/Main.php b/CRM/Contribute/Form/Contribution/Main.php
index 5950346dab..7dd7574d28 100644
--- a/CRM/Contribute/Form/Contribution/Main.php
+++ b/CRM/Contribute/Form/Contribution/Main.php
@@ -806,7 +806,7 @@ class CRM_Contribute_Form_Contribution_Main extends CRM_Contribute_Form_Contribu
           }
         }
 
-        if (empty($priceFieldMemTypes)) {
+        if (empty($priceFieldMemTypes) && $self->_membershipBlock['is_required'] == 1) {
           $errors['_qf_default'] = ts('Please select at least one membership option.');
         }
       }
diff --git a/templates/CRM/Member/Form/MembershipBlock.tpl b/templates/CRM/Member/Form/MembershipBlock.tpl
index 91880beec9..dc702afccc 100644
--- a/templates/CRM/Member/Form/MembershipBlock.tpl
+++ b/templates/CRM/Member/Form/MembershipBlock.tpl
@@ -168,14 +168,12 @@
         if ( cj('#member_price_set_id').val() ) {
             cj('#membership_type-label').hide();
             cj('#membership_type-block').hide();
-            cj('#requiredSignup').hide();
             cj('#displayFee').hide();
             cj('#separatePayment').hide();
             cj('#quickConfigConvertMessage').hide();
         } else {
             cj('#membership_type-label').show();
             cj('#membership_type-block').show();
-            cj('#requiredSignup').show();
             cj('#displayFee').show();
             cj('#separatePayment').show();
         }
-- 
2.25.1