From 8da8c1d09e2065db2a164e7ba2bcc1cd02b1ce78 Mon Sep 17 00:00:00 2001 From: eileen Date: Mon, 9 Nov 2020 12:46:54 +1300 Subject: [PATCH] Remove always true if By the time the code reaches this point contributionParams['contribution_recur_id'] must be set. We can confirm this by the fact the call to getTemplateContribution requires id to be passed in and uses it in a lookup. Also the code just before repeatTransaction ensures it is called --- CRM/Contribute/BAO/Contribution.php | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/CRM/Contribute/BAO/Contribution.php b/CRM/Contribute/BAO/Contribution.php index ae8a01f912..2f5c8769d8 100644 --- a/CRM/Contribute/BAO/Contribution.php +++ b/CRM/Contribute/BAO/Contribution.php @@ -2623,18 +2623,16 @@ LEFT JOIN civicrm_contribution contribution ON ( componentPayment.contribution_ $contribution->total_amount = $contributionParams['total_amount'] = $input['amount']; } - if (!empty($contributionParams['contribution_recur_id'])) { - $recurringContribution = civicrm_api3('ContributionRecur', 'getsingle', [ - 'id' => $contributionParams['contribution_recur_id'], - ]); - if (!empty($recurringContribution['campaign_id'])) { - // CRM-17718 the campaign id on the contribution recur record should get precedence. - $contributionParams['campaign_id'] = $recurringContribution['campaign_id']; - } - if (!empty($recurringContribution['financial_type_id'])) { - // CRM-17718 the campaign id on the contribution recur record should get precedence. - $contributionParams['financial_type_id'] = $recurringContribution['financial_type_id']; - } + $recurringContribution = civicrm_api3('ContributionRecur', 'getsingle', [ + 'id' => $contributionParams['contribution_recur_id'], + ]); + if (!empty($recurringContribution['campaign_id'])) { + // CRM-17718 the campaign id on the contribution recur record should get precedence. + $contributionParams['campaign_id'] = $recurringContribution['campaign_id']; + } + if (!empty($recurringContribution['financial_type_id'])) { + // CRM-17718 the campaign id on the contribution recur record should get precedence. + $contributionParams['financial_type_id'] = $recurringContribution['financial_type_id']; } $templateContribution = CRM_Contribute_BAO_ContributionRecur::getTemplateContribution( $contributionParams['contribution_recur_id'], -- 2.25.1