From 663d42bdfb42a04ac7607471d383ba7aa0b06d46 Mon Sep 17 00:00:00 2001 From: eileen Date: Sat, 5 Sep 2020 10:39:33 +1200 Subject: [PATCH] Remove some places where the ghost of 2014 is getting special love per https://lab.civicrm.org/dev/core/-/issues/1921 we fixed the root cause of this 6 years ago.... --- CRM/Contribute/BAO/ContributionRecur.php | 3 --- CRM/Core/Payment/BaseIPN.php | 6 ------ 2 files changed, 9 deletions(-) diff --git a/CRM/Contribute/BAO/ContributionRecur.php b/CRM/Contribute/BAO/ContributionRecur.php index 63d7799768..b7e12eb2c0 100644 --- a/CRM/Contribute/BAO/ContributionRecur.php +++ b/CRM/Contribute/BAO/ContributionRecur.php @@ -261,9 +261,6 @@ class CRM_Contribute_BAO_ContributionRecur extends CRM_Contribute_DAO_Contributi if ($recur->find(TRUE)) { $transaction = new CRM_Core_Transaction(); $recur->contribution_status_id = $cancelledId; - $recur->start_date = CRM_Utils_Date::isoToMysql($recur->start_date); - $recur->create_date = CRM_Utils_Date::isoToMysql($recur->create_date); - $recur->modified_date = CRM_Utils_Date::isoToMysql($recur->modified_date); $recur->cancel_reason = $params['cancel_reason'] ?? NULL; $recur->cancel_date = date('YmdHis'); $recur->save(); diff --git a/CRM/Core/Payment/BaseIPN.php b/CRM/Core/Payment/BaseIPN.php index 2dd1cb74e4..d99c8c8f80 100644 --- a/CRM/Core/Payment/BaseIPN.php +++ b/CRM/Core/Payment/BaseIPN.php @@ -119,9 +119,6 @@ class CRM_Core_Payment_BaseIPN { } } - $contribution->receive_date = CRM_Utils_Date::isoToMysql($contribution->receive_date); - $contribution->receipt_date = CRM_Utils_Date::isoToMysql($contribution->receipt_date); - $objects['contact'] = &$contact; $objects['contribution'] = &$contribution; @@ -305,9 +302,6 @@ class CRM_Core_Payment_BaseIPN { 'flip' => 1, ]); $contribution->contribution_status_id = $contributionStatuses['Cancelled']; - $contribution->receive_date = CRM_Utils_Date::isoToMysql($contribution->receive_date); - $contribution->receipt_date = CRM_Utils_Date::isoToMysql($contribution->receipt_date); - $contribution->thankyou_date = CRM_Utils_Date::isoToMysql($contribution->thankyou_date); $contribution->cancel_date = self::$_now; $contribution->cancel_reason = $input['reasonCode'] ?? NULL; $contribution->save(); -- 2.25.1