From 816ce9268560db33a2c0365e396f2c3f1c8dac75 Mon Sep 17 00:00:00 2001 From: Matthew Wire Date: Mon, 7 Mar 2022 23:25:49 +0000 Subject: [PATCH] Cleanup variable assigns in ContributionPage confirm --- CRM/Contribute/Form/Contribution/Confirm.php | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/CRM/Contribute/Form/Contribution/Confirm.php b/CRM/Contribute/Form/Contribution/Confirm.php index 780e00c462..92b2b5458b 100644 --- a/CRM/Contribute/Form/Contribution/Confirm.php +++ b/CRM/Contribute/Form/Contribution/Confirm.php @@ -2752,13 +2752,9 @@ class CRM_Contribute_Form_Contribution_Confirm extends CRM_Contribute_Form_Contr } $result = $payment->doPayment($paymentParams); $form->_params = array_merge($form->_params, $result); - $form->assign('trxn_id', CRM_Utils_Array::value('trxn_id', $result)); - if (!empty($result['trxn_id'])) { - $contribution->trxn_id = $result['trxn_id']; - } - if (!empty($result['payment_status_id'])) { - $contribution->payment_status_id = $result['payment_status_id']; - } + $form->assign('trxn_id', $result['trxn_id'] ?? ''); + $contribution->trxn_id = $result['trxn_id'] ?? $contribution->trxn_id ?? ''; + $contribution->payment_status_id = $result['payment_status_id']; $result['contribution'] = $contribution; if ($result['payment_status_id'] == CRM_Core_PseudoConstant::getKey('CRM_Contribute_BAO_Contribution', 'contribution_status_id', 'Pending') && $payment->isSendReceiptForPending()) { -- 2.25.1