Merge pull request #30713 from civicrm/5.76

5.76
civicrm · Jul 19, 2024 · f4c1e3d · f4c1e3d
2 parents 2325337 + cc5b5cc
commit f4c1e3d
Show file tree

Hide file tree

Showing 4 changed files with 412 additions and 198 deletions.
diff --git a/CRM/Event/BAO/Event.php b/CRM/Event/BAO/Event.php
@@ -2342,18 +2342,10 @@ public static function getICalLinks($eventId = NULL) {
   }
 
   /**
-   * @param array $profileIds
-   * @param int $cid
-   * @param int $participantId
-   * @param bool $isTest Probably not required, even when true.
-   * @param array|null $groups group values from session
-   * @param string|null $note note values from session
-   *
-   * @return array
    * @throws \CRM_Core_Exception
    * @throws \Civi\Core\Exception\DBQueryException
    */
-  public static function getProfileDisplay(array $profileIds, int $cid, int $participantId, bool $isTest = FALSE, ?array $groups = NULL, ?string $note = NULL): array {
+  public static function getProfileDisplay(array $profileIds, int $cid, int $participantId, bool $isTest = FALSE, ?array $groups = NULL, ?string $note = NULL): ?array {
     foreach ($profileIds as $gid) {
       if (CRM_Core_BAO_UFGroup::filterUFGroups($gid, $cid)) {
         $values = [];

diff --git a/CRM/Event/Form/Participant.php b/CRM/Event/Form/Participant.php
@@ -1553,7 +1553,9 @@ protected function addParticipant($contactID) {
         $participantParams['fee_amount'] = $order->getTotalAmount();
       }
     }
-    $participantParams['discount_id'] = $this->getSubmittedValue('discount_id');
+    if ($this->getSubmittedValue('discount_id')) {
+      $participantParams['discount_id'] = $this->getSubmittedValue('discount_id');
+    }
     $participant = CRM_Event_BAO_Participant::create($participantParams);
 
     // Add custom data for participant

diff --git a/contributor-key.yml b/contributor-key.yml
@@ -1029,6 +1029,10 @@
 
 - name        : Manish Zope
 
+- github      : MarcMichalsky
+  name        : Marc Michalsky
+  organization: forumZFD
+
 - github      : mariav0
   name        : Maria Vogel
   organization: civiservice.de