From: eileenmcnaugton Date: Tue, 4 Aug 2015 10:17:02 +0000 (+1200) Subject: CRM-16523 deprecate use of completetransacion in 'odd' way X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=0bad10e72dece120ed2ab12be1a12c71b11d050f;p=civicrm-core.git CRM-16523 deprecate use of completetransacion in 'odd' way --- diff --git a/CRM/Contribute/BAO/Contribution.php b/CRM/Contribute/BAO/Contribution.php index 6b2dbedca7..f59cbe4794 100644 --- a/CRM/Contribute/BAO/Contribution.php +++ b/CRM/Contribute/BAO/Contribution.php @@ -4181,7 +4181,7 @@ LIMIT 1;"; $contributionParams['receipt_date'] = $changeDate; $values['is_email_receipt'] = 1; } - if (empty($input['skipComponentSync'])) { + if (empty($input['IAmAHorribleNastyBeyondExcusableHackInTheCRMEventFORMTaskClassThatNeedsToBERemoved'])) { $participantStatuses = CRM_Core_PseudoConstant::get('CRM_Event_DAO_Participant', 'status_id', array( 'labelColumn' => 'name', 'flip' => 1, diff --git a/CRM/Core/Payment/BaseIPN.php b/CRM/Core/Payment/BaseIPN.php index 3cd79301a2..a31c1e232c 100644 --- a/CRM/Core/Payment/BaseIPN.php +++ b/CRM/Core/Payment/BaseIPN.php @@ -244,7 +244,7 @@ class CRM_Core_Payment_BaseIPN { CRM_Contribute_BAO_ContributionRecur::copyCustomValues($objects['contributionRecur']->id, $contribution->id); } - if (empty($input['skipComponentSync'])) { + if (empty($input['IAmAHorribleNastyBeyondExcusableHackInTheCRMEventFORMTaskClassThatNeedsToBERemoved'])) { if (!empty($memberships)) { // if transaction is failed then set "Cancelled" as membership status $membershipStatuses = CRM_Core_PseudoConstant::get('CRM_Member_DAO_Membership', 'status_id', array( @@ -339,7 +339,7 @@ class CRM_Core_Payment_BaseIPN { CRM_Contribute_BAO_ContributionRecur::copyCustomValues($objects['contributionRecur']->id, $contribution->id); } - if (empty($input['skipComponentSync'])) { + if (empty($input['IAmAHorribleNastyBeyondExcusableHackInTheCRMEventFORMTaskClassThatNeedsToBERemoved'])) { if (!empty($memberships)) { $membershipStatuses = CRM_Core_PseudoConstant::get('CRM_Member_DAO_Membership', 'status_id', array( 'labelColumn' => 'name', diff --git a/CRM/Event/Form/Task/Batch.php b/CRM/Event/Form/Task/Batch.php index cd248ba4a5..bb0c5900a5 100644 --- a/CRM/Event/Form/Task/Batch.php +++ b/CRM/Event/Form/Task/Batch.php @@ -383,7 +383,7 @@ class CRM_Event_Form_Task_Batch extends CRM_Event_Form_Task { 'componentName' => 'Event', 'contribution_id' => $contributionId, 'contribution_status_id' => $contributionStatusId, - 'skipComponentSync' => 1, + 'IAmAHorribleNastyBeyondExcusableHackInTheCRMEventFORMTaskClassThatNeedsToBERemoved' => 1, ); //change related contribution status. @@ -463,7 +463,7 @@ class CRM_Event_Form_Task_Batch extends CRM_Event_Form_Task { 'labelColumn' => 'name', 'flip' => 1, )); - $input['skipComponentSync'] = CRM_Utils_Array::value('skipComponentSync', $params); + $input['IAmAHorribleNastyBeyondExcusableHackInTheCRMEventFORMTaskClassThatNeedsToBERemoved'] = CRM_Utils_Array::value('IAmAHorribleNastyBeyondExcusableHackInTheCRMEventFORMTaskClassThatNeedsToBERemoved', $params); if ($statusId == $contributionStatuses['Cancelled']) { $baseIPN->cancelled($objects, $transaction, $input); $transaction->commit();