Skip to content

[stable20] CalDavBackend: check if timerange is array before accessing #23563

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rullzer merged 1 commit into from
Oct 24, 2020
Merged

[stable20] CalDavBackend: check if timerange is array before accessing #23563

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
CalDavBackend: check if timerange is array before accessing 
Signed-off-by: Simon Spannagel <[email protected]>
  • Loading branch information
@backportbot
Simon Spannagel authored and backportbot[bot] committed Oct 19, 2020
commit b1d3877625cb6ef13a80faa377fcf68e6fd0198d
3 changes: 2 additions & 1 deletion apps/dav/lib/CalDAV/CalDavBackend.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
* @author Thomas Citharel <[email protected]>
* @author Thomas Müller <[email protected]>
* @author Vinicius Cubas Brand <[email protected]>
* @author Simon Spannagel <[email protected]>
*
* @license AGPL-3.0
*
Expand Down Expand Up @@ -1364,7 +1365,7 @@ public function calendarQuery($calendarId, array $filters, $calendarType=self::C
$requirePostFilter = false;
}
// There was a time-range filter
if ($componentType === 'VEVENT' && isset($filters['comp-filters'][0]['time-range'])) {
if ($componentType === 'VEVENT' && isset($filters['comp-filters'][0]['time-range']) && is_array($filters['comp-filters'][0]['time-range'])) {
$timeRange = $filters['comp-filters'][0]['time-range'];

// If start time OR the end time is not specified, we can do a
Expand Down