Merge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-07-14-22-39-05

[civicrm-core.git] / api / v3 / Membership.php

diff --git a/api/v3/Membership.php b/api/v3/Membership.php
index 44dafb19988b06b6d72f03169db9e2ab42177216..95345c1c9106d589c59036bc8cdece9977a6d08c 100644 (file)
--- a/api/v3/Membership.php
+++ b/api/v3/Membership.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
@@ -38,13 +37,6 @@
  * @version $Id: MembershipContact.php 30171 2010-10-14 09:11:27Z mover $
  */
 
-/**
- * Files required for this package
- */
-
-require_once 'CRM/Utils/Rule.php';
-require_once 'CRM/Utils/Array.php';
-
 /**
  * Deletes an existing contact membership
  *
@@ -73,7 +65,7 @@ function civicrm_api3_membership_delete($params) {
 
 }
 
-/*
+/**
  * modify metadata
  */
 function _civicrm_api3_membership_delete_spec(&$params) {
@@ -153,7 +145,8 @@ function civicrm_api3_membership_create($params) {
   return civicrm_api3_create_success($membership, $params, 'membership', 'create', $membershipBAO);
 
 }
-/*
+
+/**
  * Adjust Metadata for Create action
  *
  * The metadata is used for setting defaults, documentation & validation
@@ -317,7 +310,8 @@ function _civicrm_api3_membership_format_params($params, &$values, $create = FAL
 
   return NULL;
 }
-/*
+
+/**
  * When we copied apiv3 from api v2 we brought across some custom behaviours - in the case of
  * membership a complicated return array is constructed. The original
  * behaviour made contact_id a required field. We still need to keep this for v3 when contact_id
@@ -329,7 +323,6 @@ function _civicrm_api3_membership_format_params($params, &$values, $create = FAL
  */
 function _civicrm_api3_membership_get_customv2behaviour(&$params, $contactID, $membershipTypeId, $activeOnly ){
     // get the membership for the given contact ID
-    require_once 'CRM/Member/BAO/Membership.php';
     $membershipParams = array( 'contact_id' => $contactID );
     if ( $membershipTypeId ) {
       $membershipParams['membership_type_id'] = $membershipTypeId;