summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2020-10-20 09:56:44 +0200
committerGitHub <noreply@github.com>2020-10-20 09:56:44 +0200
commit3157ff441c9bb89ed2c2bb58353a27e07dc6284c (patch)
tree9f10881f9a6d366c95915ea4c9e6c611dedd9a85 /apps
parentbca309a7ff97f996e533124adda8c4e36cb596a8 (diff)
parentafb88e7719f3b1a4c0a10d831da4d546fa89438d (diff)
downloadnextcloud-server-3157ff441c9bb89ed2c2bb58353a27e07dc6284c.tar.gz
nextcloud-server-3157ff441c9bb89ed2c2bb58353a27e07dc6284c.zip
Merge pull request #23564 from nextcloud/backport/23497/stable19
[stable19] CalDavBackend: check if timerange is array before accessing
Diffstat (limited to 'apps')
-rw-r--r--apps/dav/lib/CalDAV/CalDavBackend.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/apps/dav/lib/CalDAV/CalDavBackend.php b/apps/dav/lib/CalDAV/CalDavBackend.php
index ddfb0a641e5..d35ba75c1ca 100644
--- a/apps/dav/lib/CalDAV/CalDavBackend.php
+++ b/apps/dav/lib/CalDAV/CalDavBackend.php
@@ -16,6 +16,7 @@
* @author Thomas Citharel <nextcloud@tcit.fr>
* @author Thomas Müller <thomas.mueller@tmit.eu>
* @author Vinicius Cubas Brand <vinicius@eita.org.br>
+ * @author Simon Spannagel <simonspa@kth.se>
*
* @license AGPL-3.0
*
@@ -1312,7 +1313,7 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
$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