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

Merge pull request #13507 from nextcloud/backport/13503/stable14 

[stable14] RemoveClassifiedEventActivity: check if calendar still exists
This commit is contained in:
Roeland Jago Douma 2019-01-11 12:56:30 +01:00 committed by GitHub
parent 0b3d91c0b8 404099c678
commit 6f0d248be9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/dav/lib/Migration/RemoveClassifiedEventActivity.php
View File

@ -75,6 +75,10 @@ class RemoveClassifiedEventActivity implements IRepairStep {
$result = $query->execute(); $result = $query->execute();
while ($row = $result->fetch()) { while ($row = $result->fetch()) {
if ($row['principaluri'] === null) {
continue;
}
$delete->setParameter('owner', $this->getPrincipal($row['principaluri'])) $delete->setParameter('owner', $this->getPrincipal($row['principaluri']))
->setParameter('type', 'calendar') ->setParameter('type', 'calendar')
->setParameter('calendar_id', $row['calendarid']) ->setParameter('calendar_id', $row['calendarid'])
@ -105,6 +109,10 @@ class RemoveClassifiedEventActivity implements IRepairStep {
$result = $query->execute(); $result = $query->execute();
while ($row = $result->fetch()) { while ($row = $result->fetch()) {
if ($row['principaluri'] === null) {
continue;
}
$delete->setParameter('owner', $this->getPrincipal($row['principaluri'])) $delete->setParameter('owner', $this->getPrincipal($row['principaluri']))
->setParameter('type', 'calendar') ->setParameter('type', 'calendar')
->setParameter('calendar_id', $row['calendarid']) ->setParameter('calendar_id', $row['calendarid'])