From 520eea06e830a7bcac788bf613681903e3b5ea5d Mon Sep 17 00:00:00 2001 From: Eileen McNaughton Date: Sun, 27 Apr 2014 00:44:41 -0700 Subject: [PATCH] fix incorrect merge on CRM-14389 membership api - add test for fix --- api/v3/Membership.php | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/api/v3/Membership.php b/api/v3/Membership.php index 3c57a7bd4d..9fdc6bcc16 100644 --- a/api/v3/Membership.php +++ b/api/v3/Membership.php @@ -196,18 +196,11 @@ function civicrm_api3_membership_get($params) { $params['status_id'] = array('IN' => CRM_Member_BAO_MembershipStatus::getMembershipStatusCurrent()); } - if (!empty($params['contact_id']) && !is_array($params['contact_id'])) { - $membershipValues = _civicrm_api3_membership_get_customv2behaviour($params, $membershipTypeId, $activeOnly ); - } - else { - //legacy behaviour only ever worked when contact_id passed in - use standard api function otherwise - $membershipValues = _civicrm_api3_basic_get(_civicrm_api3_get_BAO(__FUNCTION__), $params, FALSE); - } - $options = _civicrm_api3_get_options_from_params($params, TRUE,'membership', 'get'); if ($options['is_count']) { return _civicrm_api3_basic_get(_civicrm_api3_get_BAO(__FUNCTION__), $params); } + $membershipValues = _civicrm_api3_basic_get(_civicrm_api3_get_BAO(__FUNCTION__), $params, FALSE); $return = $options['return']; if(empty($membershipValues) || -- 2.25.1