Skip to content

Verify that is an array before accessing it #18301

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
Dec 10, 2019
Merged

Verify that is an array before accessing it #18301

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
Verify that is an array before accessing it 
Signed-off-by: Georg Ehrke <[email protected]>
  • Loading branch information
@georgehrke
georgehrke committed Dec 9, 2019
commit 0b1b12c8a254a9fee7050f415ea7f12f4b354790
6 changes: 4 additions & 2 deletions apps/dav/lib/CalDAV/CalDavBackend.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,7 @@ private function getUserDisplayName($uid) {

return $this->userDisplayNames[$uid];
}

/**
* @return array
*/
Expand Down Expand Up @@ -1238,7 +1238,9 @@ function deleteCalendarObject($calendarId, $objectUri, $calendarType=self::CALEN
$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);
}
Expand Down