From 5828435284126c461ccbdc0abce150d744d792de Mon Sep 17 00:00:00 2001 From: eileen Date: Fri, 5 Feb 2021 15:33:11 +1300 Subject: [PATCH] [REF] Stop setting contribution->id This is not needed as we can otherwise get it from the contributionResult directly --- CRM/Contribute/BAO/Contribution.php | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/CRM/Contribute/BAO/Contribution.php b/CRM/Contribute/BAO/Contribution.php index 3b1c15b868..4868f447e6 100644 --- a/CRM/Contribute/BAO/Contribution.php +++ b/CRM/Contribute/BAO/Contribution.php @@ -2517,9 +2517,9 @@ LEFT JOIN civicrm_contribution contribution ON ( componentPayment.contribution_ } $createContribution = civicrm_api3('Contribution', 'create', $contributionParams); - $contribution->id = $createContribution['id']; - $contribution->copyCustomFields($templateContribution['id'], $contribution->id); - self::handleMembershipIDOverride($contribution->id, $input); + $temporaryObject = new CRM_Contribute_BAO_Contribution(); + $temporaryObject->copyCustomFields($templateContribution['id'], $createContribution['id']); + self::handleMembershipIDOverride($createContribution['id'], $input); // Add new soft credit against current $contribution. CRM_Contribute_BAO_ContributionRecur::addrecurSoftCredit($contributionParams['contribution_recur_id'], $createContribution['id']); return $createContribution; @@ -4282,8 +4282,7 @@ INNER JOIN civicrm_activity ON civicrm_activity_contact.activity_id = civicrm_ac $changeDate = CRM_Utils_Array::value('trxn_date', $input, date('YmdHis')); $contributionResult = self::repeatTransaction($contribution, $input, $contributionParams); - $contributionID = (int) $contribution->id; - unset($contribution); + $contributionID = (int) ($contribution->id ?? $contributionResult['id']); if ($input['component'] == 'contribute') { if ($contributionParams['contribution_status_id'] === $completedContributionStatusID) { -- 2.25.1