Merge pull request #17143 from mattwire/donthidedisabledmemberships

[civicrm-core.git] / CRM / Member / Page / Tab.php

diff --git a/CRM/Member/Page/Tab.php b/CRM/Member/Page/Tab.php
index 8301a964a757d425ddddb293ce31f9b497e5cc85..7c4ad24d143ac0f18572ff28cba266b88e0a7206 100644 (file)
--- a/CRM/Member/Page/Tab.php
+++ b/CRM/Member/Page/Tab.php
@@ -33,17 +33,9 @@ class CRM_Member_Page_Tab extends CRM_Core_Page {
    * called when action is browse.
    */
   public function browse() {
-    $links = self::links('all', $this->_isPaymentProcessor, $this->_accessContribution);
-    CRM_Financial_BAO_FinancialType::getAvailableMembershipTypes($membershipTypes);
-    $addWhere = "membership_type_id IN (0)";
-    if (!empty($membershipTypes)) {
-      $addWhere = "membership_type_id IN (" . implode(',', array_keys($membershipTypes)) . ")";
-    }
-
     $membership = [];
     $dao = new CRM_Member_DAO_Membership();
     $dao->contact_id = $this->_contactId;
-    $dao->whereAdd($addWhere);
     $dao->find();
 
     //CRM--4418, check for view, edit, delete
@@ -150,8 +142,8 @@ class CRM_Member_Page_Tab extends CRM_Core_Page {
       }
 
       // if relevant--membership is active and type allows inheritance--count related memberships
-      if (CRM_Utils_Array::value('is_current_member', $statusANDType[$dao->id])
-        && CRM_Utils_Array::value('relationship_type_id', $statusANDType[$dao->id])
+      if (!empty($statusANDType[$dao->id]['is_current_member'])
+        && !empty($statusANDType[$dao->id]['relationship_type_id'])
         && empty($dao->owner_membership_id)
       ) {
         // not an related membership