Merge pull request #10506 from seamuslee001/CRM-20253-test

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

diff --git a/api/v3/MembershipType.php b/api/v3/MembershipType.php
index fb29a18d7d4b7a0d6e65b187df13f4325a7229b0..a8b29405c522e96e776998e287cddd31fe2768d7 100644 (file)
--- a/api/v3/MembershipType.php
+++ b/api/v3/MembershipType.php
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 4.7                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2016                                |
+ | Copyright CiviCRM LLC (c) 2004-2017                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -66,6 +66,7 @@ function _civicrm_api3_membership_type_create_spec(&$params) {
   $params['name']['api.required'] = 1;
   $params['duration_unit']['api.required'] = 1;
   $params['duration_interval']['api.required'] = 1;
+  $params['period_type']['api.required'] = 1;
   $params['is_active']['api.default'] = 1;
 }
 
@@ -109,7 +110,7 @@ function civicrm_api3_membership_type_get($params) {
  *   Array of parameters determined by getfields.
  */
 function _civicrm_api3_membership_type_getlist_params(&$request) {
-  if (!isset($request['params']['is_active'])) {
+  if (!isset($request['params']['is_active']) && empty($request['params']['id'])) {
     $request['params']['is_active'] = 1;
   }
 }