From 1acc24d5789ad678e4587eed345e241d63d9b092 Mon Sep 17 00:00:00 2001 From: Eileen McNaughton Date: Wed, 7 Jan 2015 16:46:57 +1300 Subject: [PATCH] enotice fixes --- CRM/Member/BAO/Membership.php | 2 +- CRM/Member/Form/MembershipRenewal.php | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CRM/Member/BAO/Membership.php b/CRM/Member/BAO/Membership.php index 1bac5735b6..b29e989f8f 100644 --- a/CRM/Member/BAO/Membership.php +++ b/CRM/Member/BAO/Membership.php @@ -80,7 +80,7 @@ class CRM_Member_BAO_Membership extends CRM_Member_DAO_Membership { CRM_Utils_Hook::pre('edit', 'Membership', $params['id'], $params); } else { - CRM_Utils_Hook::pre('create', 'Membership', $params['id'], $params); + CRM_Utils_Hook::pre('create', 'Membership', NULL, $params); } $id = $params['id']; // we do this after the hooks are called in case it has been altered diff --git a/CRM/Member/Form/MembershipRenewal.php b/CRM/Member/Form/MembershipRenewal.php index b54420d99a..7eff46e7eb 100644 --- a/CRM/Member/Form/MembershipRenewal.php +++ b/CRM/Member/Form/MembershipRenewal.php @@ -708,8 +708,12 @@ WHERE id IN ( ' . implode(' , ', array_keys($membershipType)) . ' )'; } } $formValues['contact_id'] = $this->_contactID; - - CRM_Member_BAO_Membership::recordMembershipContribution(array_merge($formValues, array('membership_id' => $renewMembership->id))); + //recordMembershipContribution receives params as a reference & adds one variable. This is + // not a great pattern & ideally it would not receive as a reference. We assign our params as a + // temporary variable to avoid e-notice & to make it clear to future refactorer that + // this function is NOT reliant on that var being set + $temporaryParams = array_merge($formValues, array('membership_id' => $renewMembership->id)); + CRM_Member_BAO_Membership::recordMembershipContribution($temporaryParams); } $receiptSend = FALSE; -- 2.25.1