From d1d0530d5830671812c37253a0c2745825ba60b6 Mon Sep 17 00:00:00 2001 From: eileen Date: Fri, 5 Jan 2024 17:42:53 +1300 Subject: [PATCH] Fix rc-only regression --- CRM/Event/Form/Participant.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/CRM/Event/Form/Participant.php b/CRM/Event/Form/Participant.php index 72dcf45d54..43951ad95d 100644 --- a/CRM/Event/Form/Participant.php +++ b/CRM/Event/Form/Participant.php @@ -1995,13 +1995,13 @@ INNER JOIN civicrm_price_field_value value ON ( value.id = lineItem.price_field_ * @noinspection PhpDocSignatureIsNotCompleteInspection */ public function getContactID():?int { + // Always set it back to the submitted value if there is one - this is to prevent it being set in + // proProcess & then ignoring the actual submitted value in post-process. + if ($this->getSubmittedValue('contact_id')) { + $this->_contactID = $this->getSubmittedValue('contact_id'); + } if ($this->_contactID === NULL) { - if ($this->getSubmittedValue('contact_id')) { - $contactID = $this->getSubmittedValue('contact_id'); - } - else { - $contactID = CRM_Utils_Request::retrieve('cid', 'Positive', $this); - } + $contactID = CRM_Utils_Request::retrieve('cid', 'Positive', $this); if (!$contactID && $this->getParticipantID()) { $contactID = $this->getParticipantValue('contact_id'); } -- 2.25.1