CRM-12147

diff --git a/CRM/Member/BAO/Membership.php b/CRM/Member/BAO/Membership.php
index aea6fa00b26b3635b9577553ded69601e52ea38f..bbf97f2ec484aaf3ea5fa8e4962326b4229c9799 100644 (file)
--- a/CRM/Member/BAO/Membership.php
+++ b/CRM/Member/BAO/Membership.php
@@ -583,7 +583,13 @@ INNER JOIN  civicrm_membership_type type ON ( type.id = membership.membership_ty
    * @access public
    */
   static function deleteMembership($membershipId) {
-    CRM_Utils_Hook::pre('delete', 'Membership', $membershipId, CRM_Core_DAO::$_nullArray);
+    // CRM-12147, retrieve membership data before we delete it for hooks
+    $params = array('id' => $membershipId);
+    $memValues = array();
+    $memberships = self::getValues($params, $memValues);
+    $membership = $memberships[$membershipId];
+
+    CRM_Utils_Hook::pre('delete', 'Membership', $membershipId, $memValues);
 
     $transaction = new CRM_Core_Transaction();
 
@@ -593,7 +599,13 @@ INNER JOIN  civicrm_membership_type type ON ( type.id = membership.membership_ty
 
     $params = array();
     $deleteActivity = false;
-    $membershipActivities = array('Membership Signup', 'Membership Renewal', 'Change Membership Status', 'Change Membership Type', 'Membership Renewal Reminder');
+    $membershipActivities =  array(
+      'Membership Signup',
+      'Membership Renewal',
+      'Change Membership Status',
+      'Change Membership Type',
+      'Membership Renewal Reminder'
+    );
     foreach($membershipActivities as $membershipActivity) {
       $activityId = array_search($membershipActivity, $activityTypes);
       if ($activityId) {
@@ -603,15 +615,10 @@ INNER JOIN  civicrm_membership_type type ON ( type.id = membership.membership_ty
     }
     if ($deleteActivity) {
       $params['source_record_id'] = $membershipId;
-    CRM_Activity_BAO_Activity::deleteActivity($params);
+      CRM_Activity_BAO_Activity::deleteActivity($params);
     }
     self::deleteMembershipPayment($membershipId);
 
-    // CRM-12147, retrieve membership data before we delete it for hooks
-    $params = array('id' => $membershipId);
-    $memberships = self::getValues($params, $values);
-    $membership = $memberships[$membershipId];
-
     $results = $membership->delete();
     $transaction->commit();