From de46184a5b6035693583a0a624591023d9e82867 Mon Sep 17 00:00:00 2001
From: johnnyq <johnny@pittpc.com>
Date: Sun, 9 Aug 2026 13:41:01 -0400
Subject: [PATCH] Fix calendar queries missing columns lost in the SELECT *
 sweep

---
 agent/calendar.php            | 4 ++--
 guest/guest_calendar_feed.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/agent/calendar.php b/agent/calendar.php
index 09ef36f8f..1d6444178 100644
--- a/agent/calendar.php
+++ b/agent/calendar.php
@@ -304,8 +304,8 @@ while ($row = mysqli_fetch_assoc($sql)) {
         },
         events: [
             <?php
-            $sql = mysqli_query($mysqli, "SELECT calendar_color, calendar_id, calendar_name, event_all_day, event_id, event_repeat,
-                event_title FROM calendar_events LEFT JOIN calendars ON event_calendar_id = calendar_id $client_event_query");
+            $sql = mysqli_query($mysqli, "SELECT calendar_color, calendar_id, calendar_name, event_all_day, event_end, event_id,
+                event_repeat, event_start, event_title FROM calendar_events LEFT JOIN calendars ON event_calendar_id = calendar_id $client_event_query");
 
             // Repeating events are stored as a single row, so the occurrences have to
             // be materialised here - the bundled FullCalendar build has no rrule
diff --git a/guest/guest_calendar_feed.php b/guest/guest_calendar_feed.php
index 97a07b900..fa72b73b7 100644
--- a/guest/guest_calendar_feed.php
+++ b/guest/guest_calendar_feed.php
@@ -45,7 +45,7 @@ $feed_key = escapeSql($_GET['key']);
 
 $sql = mysqli_query(
     $mysqli,
-    "SELECT calendar_id, calendar_name FROM calendars
+    "SELECT calendar_color, calendar_feed_busy_only, calendar_id, calendar_name FROM calendars
     WHERE calendar_feed_key = '$feed_key'
     AND calendar_feed_key IS NOT NULL
     AND calendar_archived_at IS NULL