Merge pull request #1923 from civicrm/4.3

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

diff --git a/api/v3/MembershipStatus.php b/api/v3/MembershipStatus.php
index 082e45748ee0918e26b329da1626ca356676c36a..8296daa688c6990a71787ad11e60ec571853c530 100644 (file)
--- a/api/v3/MembershipStatus.php
+++ b/api/v3/MembershipStatus.php
@@ -1,9 +1,8 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.3                                                |
+ | CiviCRM version 4.4                                                |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2013                                |
  +--------------------------------------------------------------------+
@@ -38,12 +37,6 @@
  *
  */
 
-/**
- * Files required for this package
- */
-
-require_once 'CRM/Member/BAO/MembershipStatus.php';
-
 /**
  * Create a Membership Status
  *
@@ -59,12 +52,12 @@ function civicrm_api3_membership_status_create($params) {
   return _civicrm_api3_basic_create(_civicrm_api3_get_BAO(__FUNCTION__), $params);
 }
 
-/*
+/**
  * Adjust Metadata for Create action
-*
-* The metadata is used for setting defaults, documentation & validation
-* @param array $params array or parameters determined by getfields
-*/
+ *
+ * The metadata is used for setting defaults, documentation & validation
+ * @param array $params array or parameters determined by getfields
+ */
 function _civicrm_api3_membership_status_create_spec(&$params) {
   $params['name']['api.aliases'] = array('label');
 }
@@ -102,7 +95,6 @@ function &civicrm_api3_membership_status_update($params) {
   //don't allow duplicate names.
   $name = CRM_Utils_Array::value('name', $params);
   if ($name) {
-    require_once 'CRM/Member/DAO/MembershipStatus.php';
     $status = new CRM_Member_DAO_MembershipStatus();
     $status->name = $params['name'];
     if ($status->find(TRUE) && $status->id != $params['id']) {
@@ -110,7 +102,6 @@ function &civicrm_api3_membership_status_update($params) {
     }
   }
 
-  require_once 'CRM/Member/BAO/MembershipStatus.php';
   $membershipStatusBAO = new CRM_Member_BAO_MembershipStatus();
   $membershipStatusBAO->id = $params['id'];
   if ($membershipStatusBAO->find(TRUE)) {
@@ -172,8 +163,6 @@ SELECT start_date, end_date, join_date
   $params = array(1 => array($membershipID, 'Integer'));
   $dao = &CRM_Core_DAO::executeQuery($query, $params);
   if ($dao->fetch()) {
-    require_once 'CRM/Member/BAO/MembershipStatus.php';
-
     // Take the is_admin column in MembershipStatus into consideration when requested
     if (! CRM_Utils_Array::value('ignore_admin_only', $membershipParams) ) {
       $result = &CRM_Member_BAO_MembershipStatus::getMembershipStatusByDate($dao->start_date, $dao->end_date, $dao->join_date, 'today', TRUE);