2025-05-13 20:19:06 +02:00
parent 53c188955e
commit 14e3ddc464
1 changed files with 2 additions and 1 deletions
							
							
								
							
							
						
@@ -207,10 +207,11 @@ class CalendarModel
        if ($visibleCalendarTypes) {
            $where .= " AND event_type IN (" . implode(",", $visibleCalendarTypes) . ")";
        }
        if ($r->visibleCancellation && $r->visibleCancellation != 1) {
        if ($r->visibleCancellation === "0") {
            $where .= " AND canceld = '0' ";
        }
        $sql = "SELECT `cal_events`.id,`cal_events`.categories, uuid, calendar_id, `cal_events`.user_id, start_time, end_time, timezone, all_day_event, `cal_events`.name,`cal_calendars`.name calendar_name, description, location, repeat_end_time, reminder, ctime,cname, mtime,mname, muser_id, busy, status, resource_event_id, private, rrule, `cal_events`.background, `cal_events`.files_folder_id, read_only, category_id, exception_for_event_id, recurrence_id, is_organizer,event_type,busy,recurrence,rrule_events FROM cal_events INNER JOIN `cal_calendars` ON (`cal_calendars`.`id`=`cal_events`.`calendar_id`) WHERE 1=1 $where ORDER BY start_time DESC";
        $res = $dbcal->query($sql);