From e1a84e1405ad09fee8a31ae88db8e6705ad99475 Mon Sep 17 00:00:00 2001 From: Eileen McNaughton Date: Tue, 30 Aug 2022 11:19:08 +1200 Subject: [PATCH] Remove obsolete param from duplicated function --- CRM/Contribute/Form/Contribution.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/CRM/Contribute/Form/Contribution.php b/CRM/Contribute/Form/Contribution.php index b8ef62d7fc..d23fae5bde 100644 --- a/CRM/Contribute/Form/Contribution.php +++ b/CRM/Contribute/Form/Contribution.php @@ -1243,7 +1243,7 @@ class CRM_Contribute_Form_Contribution extends CRM_Contribute_Form_AbstractEditP * @throws \CRM_Core_Exception * @throws \CiviCRM_API3_Exception */ - protected function processFormContribution( + private function processFormContribution( $params, $result, $contributionParams, @@ -1257,9 +1257,8 @@ class CRM_Contribute_Form_Contribution extends CRM_Contribute_Form_AbstractEditP $contactID = $contributionParams['contact_id']; $isEmailReceipt = !empty($form->_values['is_email_receipt']); - $isSeparateMembershipPayment = !empty($params['separate_membership_payment']); $pledgeID = !empty($params['pledge_id']) ? $params['pledge_id'] : $form->_values['pledge_id'] ?? NULL; - if (!$isSeparateMembershipPayment && !empty($form->_values['pledge_block_id']) && + if (!empty($form->_values['pledge_block_id']) && (!empty($params['is_pledge']) || $pledgeID)) { $isPledge = TRUE; } -- 2.25.1