From 890d94686820b526649ab7e7438d4ed534e0289d Mon Sep 17 00:00:00 2001 From: eileen Date: Tue, 9 Feb 2021 23:27:52 +1300 Subject: [PATCH] Remove unused code This value is added to input but does not make it from there to contributionParams as it is not in the white list. It is also not used in repeatransaction - which is the other place input is passed to but which only uses it in a highly filtered form --- CRM/Contribute/BAO/Contribution.php | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/CRM/Contribute/BAO/Contribution.php b/CRM/Contribute/BAO/Contribution.php index e8b6a53af2..a268e255f8 100644 --- a/CRM/Contribute/BAO/Contribution.php +++ b/CRM/Contribute/BAO/Contribution.php @@ -4205,10 +4205,6 @@ INNER JOIN civicrm_activity ON civicrm_activity_contact.activity_id = civicrm_ac unset($ids); $contributionID = !empty($contribution->id) ? (int) $contribution->id : NULL; - // The previous details are used when calculating line items so keep it before any code that 'does something' - if (!empty($contribution->id)) { - $input['prevContribution'] = CRM_Contribute_BAO_Contribution::getValues(['id' => $contribution->id]); - } $inputContributionWhiteList = [ 'fee_amount', 'net_amount', @@ -4243,7 +4239,7 @@ INNER JOIN civicrm_activity ON civicrm_activity_contact.activity_id = civicrm_ac if ($recurringContributionID) { $contributionParams['contribution_recur_id'] = $recurringContributionID; } - $changeDate = CRM_Utils_Array::value('trxn_date', $input, date('YmdHis')); + if (!$contributionID) { $contributionResult = self::repeatTransaction($input, $contributionParams); $contributionID = $contributionResult['id']; @@ -4253,7 +4249,7 @@ INNER JOIN civicrm_activity ON civicrm_activity_contact.activity_id = civicrm_ac if ($contributionParams['contribution_status_id'] === $completedContributionStatusID) { self::updateMembershipBasedOnCompletionOfContribution( $contributionID, - $changeDate + $input['trxn_date'] ?? date('YmdHis') ); } } -- 2.25.1