diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2019-12-10 10:25:21 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-10 10:25:21 +0100 |
| commit | 58da7c585ea68d57bdc94d232079a93c33804107 (patch) | |
| tree | ffaf8f0f6ad969b75f03f36b2b4df27c34901924 /apps | |
| parent | b78a141b0b003f6de04f16863e0fb67f28658dab (diff) | |
| parent | 0b1b12c8a254a9fee7050f415ea7f12f4b354790 (diff) | |
| download | nextcloud-server-58da7c585ea68d57bdc94d232079a93c33804107.tar.gz nextcloud-server-58da7c585ea68d57bdc94d232079a93c33804107.zip | |
Merge pull request #18301 from nextcloud/bugfix/noid/fix_array_access_on_non_array
Verify that is an array before accessing it
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/dav/lib/CalDAV/CalDavBackend.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/apps/dav/lib/CalDAV/CalDavBackend.php b/apps/dav/lib/CalDAV/CalDavBackend.php index b7dff4be3ac..237c604f661 100644 --- a/apps/dav/lib/CalDAV/CalDavBackend.php +++ b/apps/dav/lib/CalDAV/CalDavBackend.php @@ -445,7 +445,7 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription return $this->userDisplayNames[$uid]; } - + /** * @return array */ @@ -1238,7 +1238,9 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription $stmt = $this->db->prepare('DELETE FROM `*PREFIX*calendarobjects` WHERE `calendarid` = ? AND `uri` = ? AND `calendartype` = ?'); $stmt->execute([$calendarId, $objectUri, $calendarType]); - $this->purgeProperties($calendarId, $data['id'], $calendarType); + if (is_array($data)) { + $this->purgeProperties($calendarId, $data['id'], $calendarType); + } $this->addChange($calendarId, $objectUri, 3, $calendarType); } |