Merge pull request #624 from humhub/v1.7

V1.7

Author: luke-

docs/CHANGELOG.md

@@ -5,6 +5,7 @@ Changelog
 -----------------------
 - Fix #609: Fix for PHP 8.4
 - Fix #621: Implemented `module-coding-standards`
+- Fix #620: Fix CalendarQuery error
 
 1.8.3 (October 9, 2025)
 -----------------------
@@ -30,9 +31,10 @@ Changelog
 - Enh #549: Migration to Bootstrap 5 for HumHub 1.18
 - Enh #378: Use new content state service
 
-1.7.20 (Unreleased)
----------------------------
+1.7.20 (October 20, 2025)
+-------------------------
 - Enh #608: Improved `Upcoming events` widget to include events from followed spaces and profiles
+- Enh #618: Fixed a PHP error that occurred while fetching `organizer` of `Recurrence item`
 
 1.7.19 (September 26, 2025)
 ---------------------------

interfaces/VCalendar.php

@@ -245,28 +245,30 @@ private function addVEvent(CalendarEventIF $item, bool $isRecurrenceChild = fals
             }
         }
 
-        $organizer = $item->getOrganizer();
-        if ($organizer instanceof User) {
-            $evt->add(
-                'ORGANIZER;CN=' . $this->getCN($organizer),
-                'mailto:' . $this->getMailto($organizer),
-            );
+        $eventType = $item->getEventType();
+
+        if ($eventType instanceof CalendarEntryType && !empty($category = $eventType->name)) {
+            $evt->add('CATEGORIES', $category);
         }
 
-        if ($this->includeParticipantInfo && $item instanceof CalendarEventParticipationIF) {
-            foreach ($item->findParticipants()->limit(self::MAX_PARTICIPANTS_COUNT)->all() as $participant) {
-                /* @var $user User */
+        if ($item instanceof CalendarEventParticipationIF) {
+            $organizer = $item->getOrganizer();
+            if ($organizer instanceof User) {
                 $evt->add(
-                    'ATTENDEE;CN=' . $this->getCN($participant),
-                    'mailto:' . $this->getMailto($participant),
+                    'ORGANIZER;CN=' . $this->getCN($organizer),
+                    'mailto:' . $this->getMailto($organizer),
                 );
             }
-        }
 
-        $eventType = $item->getEventType();
-
-        if ($eventType instanceof CalendarEntryType && !empty($category = $eventType->name)) {
-            $evt->add('CATEGORIES', $category);
+            if ($this->includeParticipantInfo) {
+                foreach ($item->findParticipants()->limit(self::MAX_PARTICIPANTS_COUNT)->all() as $participant) {
+                    /* @var $user User */
+                    $evt->add(
+                        'ATTENDEE;CN=' . $this->getCN($participant),
+                        'mailto:' . $this->getMailto($participant),
+                    );
+                }
+            }
         }
 
         return $this;