From: Tim Otten <totten@civicrm.org>
Date: Mon, 7 Apr 2014 22:34:43 +0000 (-0700)
Subject: Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-04-07-15-32-51
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=afed0de9c0305abb1c011d6e87fd5e7a1ddee543;p=civicrm-core.git

Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-04-07-15-32-51

Conflicts:
	api/v3/Membership.php
---

afed0de9c0305abb1c011d6e87fd5e7a1ddee543
diff --cc api/v3/Membership.php
index 528527f691,3dc3404730..8f1c2572d3
--- a/api/v3/Membership.php
+++ b/api/v3/Membership.php
@@@ -192,7 -192,19 +192,19 @@@ function civicrm_api3_membership_get($p
    }
    $activeOnly = CRM_Utils_Array::value('active_only', $params, $activeOnly);
  
+   //@todo replace this by handling in API layer - we should have enough info to do this
+   // between pseudoconstant & fk - see comments in format_params
+   $membershipTypeId = CRM_Utils_Array::value('membership_type_id', $params);
+   if (!$membershipTypeId) {
+     $membershipType = CRM_Utils_Array::value('membership_type', $params);
+     if ($membershipType) {
+       $membershipTypeId = CRM_Core_DAO::getFieldValue('CRM_Member_DAO_MembershipType',
+           $membershipType, 'id', 'name'
+       );
+     }
+   }
+ 
 -  if (CRM_Utils_Array::value('contact_id', $params) && !is_array($params['contact_id'])) {
 +  if (!empty($params['contact_id']) && !is_array($params['contact_id'])) {
      $membershipValues = _civicrm_api3_membership_get_customv2behaviour($params, $membershipTypeId, $activeOnly );
    }
    else {