mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #18301 from nextcloud/bugfix/noid/fix_array_access_on_non_array 

Verify that  is an array before accessing it
This commit is contained in:
Roeland Jago Douma 2019-12-10 10:25:21 +01:00 committed by GitHub
parent b78a141b0b 0b1b12c8a2
commit 58da7c585e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/dav/lib/CalDAV/CalDavBackend.php
View File

@ -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);
}