Remove api limit, make deprecated function more deprecated

civicrm · Sep 26, 2017 · d8683f7 · d8683f7
1 parent f0bcec1
commit d8683f7
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/CRM/Member/BAO/Membership.php b/CRM/Member/BAO/Membership.php
@@ -851,6 +851,9 @@ public static function getContactMembership($contactID, $memType, $isTest, $memb
       if (CRM_Member_BAO_MembershipType::retrieve($params, $membershipType)) {
         $memberTypesSameParentOrg = civicrm_api3('MembershipType', 'get', array(
           'member_of_contact_id' => $membershipType['member_of_contact_id'],
+          'options' => array(
+            'limit' => 0,
+          ),
         ));
         $memberTypesSameParentOrgList = implode(',', array_keys(CRM_Utils_Array::value('values', $memberTypesSameParentOrg, array())));
         $dao->whereAdd('membership_type_id IN (' . $memberTypesSameParentOrgList . ')');

diff --git a/CRM/Member/BAO/MembershipType.php b/CRM/Member/BAO/MembershipType.php
@@ -620,15 +620,14 @@ public static function getRenewalDatesForMembershipType($membershipId, $changeTo
    *   array of the details of membership types
    */
   public static function getMembershipTypesByOrg($orgID) {
-    $membershipTypes = array();
-    $dao = new CRM_Member_DAO_MembershipType();
-    $dao->member_of_contact_id = $orgID;
-    $dao->find();
-    while ($dao->fetch()) {
-      $membershipTypes[$dao->id] = array();
-      CRM_Core_DAO::storeValues($dao, $membershipTypes[$dao->id]);
-    }
-    return $membershipTypes;
+    Civi::log()->warning('Deprecated function getMembershipTypesByOrg, please user membership_type api', array('civi.tag' => 'deprecated'));
+    $memberTypesSameParentOrg = civicrm_api3('MembershipType', 'get', array(
+      'member_of_contact_id' => $orgID,
+      'options' => array(
+        'limit' => 0,
+      ),
+    ));
+    return CRM_Utils_Array::value('values', $memberTypesSameParentOrg, array());
   }
 
   /**