enotice fixes

diff --git a/CRM/Member/BAO/Membership.php b/CRM/Member/BAO/Membership.php
index 1bac5735b6d085816dbd27cc1dd00dc3cf091cff..b29e989f8f716a5d338b94f4b5b669acd6df8862 100644 (file)
--- 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 b54420d99ab76aafb9fc69b9cee78e7f21c4ea52..7eff46e7eb1ca0694f633e63ccd3c1f3a59f1dab 100644 (file)
--- 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;