From 82f6adad8518f5998a3094f1499188dd9f31eaf9 Mon Sep 17 00:00:00 2001 From: Eileen McNaughton Date: Mon, 20 Nov 2023 17:01:01 +1300 Subject: [PATCH] Fix always present parameter --- CRM/Contribute/Form/Contribution/Main.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/CRM/Contribute/Form/Contribution/Main.php b/CRM/Contribute/Form/Contribution/Main.php index 90d939c4b1..dac81a9641 100644 --- a/CRM/Contribute/Form/Contribution/Main.php +++ b/CRM/Contribute/Form/Contribution/Main.php @@ -355,7 +355,7 @@ class CRM_Contribute_Form_Contribution_Main extends CRM_Contribute_Form_Contribu // build price set form. $this->set('priceSetId', $this->_priceSetId); if (empty($this->_ccid)) { - $this->buildPriceSet($this, $this->getFormContext()); + $this->buildPriceSet($this); } if ($this->_values['is_monetary'] && $this->_values['is_recur'] && empty($this->_values['pledge_id']) @@ -478,19 +478,18 @@ class CRM_Contribute_Form_Contribution_Main extends CRM_Contribute_Form_Contribu * Build the price set form. * * @param CRM_Core_Form $form - * @param string|null $component * * @return void * @throws \CRM_Core_Exception */ - private function buildPriceSet(&$form, $component = NULL) { + private function buildPriceSet($form) { $validPriceFieldIds = array_keys($this->getPriceFieldMetaData()); $form->assign('priceSet', $form->_priceSet); // @todo - this hook wrangling can be done earlier if we set the form on $this->>order. $feeBlock = &$form->_values['fee']; // Call the buildAmount hook. - CRM_Utils_Hook::buildAmount($component ?? 'contribution', $form, $feeBlock); + CRM_Utils_Hook::buildAmount($this->getFormContext(), $form, $feeBlock); // CRM-14492 Admin price fields should show up on event registration if user has 'administer CiviCRM' permissions $adminFieldVisible = CRM_Core_Permission::check('administer CiviCRM'); -- 2.25.1