AS1024/itflow
1
0
Fork 0
mirror of https://github.com/itflow-org/itflow synced 2026-08-22 23:45:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix calendar queries missing columns lost in the SELECT * sweep

Browse Source
This commit is contained in:
johnnyq
2026-08-09 13:41:01 -04:00
parent f237993fd7
commit de46184a5b
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
agent/calendar.php
View File

@@ -304,8 +304,8 @@ while ($row = mysqli_fetch_assoc($sql)) {
}, },
events: [ events: [
<?php <?php
$sql = mysqli_query($mysqli, "SELECT calendar_color, calendar_id, calendar_name, event_all_day, event_id, event_repeat, $sql = mysqli_query($mysqli, "SELECT calendar_color, calendar_id, calendar_name, event_all_day, event_end, event_id,
event_title FROM calendar_events LEFT JOIN calendars ON event_calendar_id = calendar_id $client_event_query"); 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 // Repeating events are stored as a single row, so the occurrences have to
// be materialised here - the bundled FullCalendar build has no rrule // be materialised here - the bundled FullCalendar build has no rrule

2
guest/guest_calendar_feed.php
View File

@@ -45,7 +45,7 @@ $feed_key = escapeSql($_GET['key']);
$sql = mysqli_query( $sql = mysqli_query(
$mysqli, $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' WHERE calendar_feed_key = '$feed_key'
AND calendar_feed_key IS NOT NULL AND calendar_feed_key IS NOT NULL
AND calendar_archived_at IS NULL AND calendar_archived_at IS NULL