projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #16274 from colemanw/type
[civicrm-core.git]
/
api
/
v3
/
Membership.php
diff --git
a/api/v3/Membership.php
b/api/v3/Membership.php
index 2038306a23ae0d1d7cf3daee3b15fd57bd00bbd1..879aeb80ad1f45d905f47e7682c0282c74f265ba 100644
(file)
--- a/
api/v3/Membership.php
+++ b/
api/v3/Membership.php
@@
-66,6
+66,9
@@
function civicrm_api3_membership_delete($params) {
*
* @return array
* API result array.
*
* @return array
* API result array.
+ *
+ * @throws \CRM_Core_Exception
+ * @throws \CiviCRM_API3_Exception
*/
function civicrm_api3_membership_create($params) {
// check params for membership id during update
*/
function civicrm_api3_membership_create($params) {
// check params for membership id during update
@@
-121,10
+124,6
@@
function civicrm_api3_membership_create($params) {
$ids = [];
if (empty($params['id'])) {
$params['action'] = CRM_Core_Action::ADD;
$ids = [];
if (empty($params['id'])) {
$params['action'] = CRM_Core_Action::ADD;
- // we need user id during add mode
- if (!empty($params['contact_id'])) {
- $ids['userId'] = $params['contact_id'];
- }
}
else {
// edit mode
}
else {
// edit mode
@@
-134,7
+133,7
@@
function civicrm_api3_membership_create($params) {
}
// @todo stop passing $ids (membership and userId may be set above)
}
// @todo stop passing $ids (membership and userId may be set above)
- $membershipBAO = CRM_Member_BAO_Membership::create($params, $ids
, TRUE
);
+ $membershipBAO = CRM_Member_BAO_Membership::create($params, $ids);
if (array_key_exists('is_error', $membershipBAO)) {
// In case of no valid status for given dates, $membershipBAO
if (array_key_exists('is_error', $membershipBAO)) {
// In case of no valid status for given dates, $membershipBAO