Merge pull request #12031 from mukeshcompucorp/fix-template-structure-issues

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

diff --git a/api/v3/Membership.php b/api/v3/Membership.php
index 4754152317be4b8e4f2480c586c15816858daff7..4f0c657a9184ad1f70425e6bc19902fccf43e221 100644 (file)
--- a/api/v3/Membership.php
+++ b/api/v3/Membership.php
@@ -1,9 +1,9 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2016                                |
+ | Copyright CiviCRM LLC (c) 2004-2017                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -54,9 +54,8 @@ function _civicrm_api3_membership_delete_spec(&$params) {
  *
  * @param array $params
  *   Array array holding id - Id of the contact membership to be deleted.
- *
- * @return array
- *   API result array.
+ * @return array API result array.
+ * @throws API_Exception
  */
 function civicrm_api3_membership_delete($params) {
   if (isset($params['preserve_contribution'])) {
@@ -136,6 +135,7 @@ function civicrm_api3_membership_create($params) {
     $ids['userId'] = $params['contact_id'];
   }
   //for edit membership id should be present
+  // probably not required now.
   if (!empty($params['id'])) {
     $ids['membership'] = $params['id'];
     $action = CRM_Core_Action::UPDATE;
@@ -143,10 +143,6 @@ function civicrm_api3_membership_create($params) {
   //need to pass action to handle related memberships.
   $params['action'] = $action;
 
-  if (empty($params['line_item']) && !empty($params['membership_type_id']) && empty($params['skipLineItem'])) {
-    CRM_Price_BAO_LineItem::getLineItemArray($params, NULL, 'membership', $params['membership_type_id']);
-  }
-
   $membershipBAO = CRM_Member_BAO_Membership::create($params, $ids, TRUE);
 
   if (array_key_exists('is_error', $membershipBAO)) {