diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2019-01-11 14:56:25 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-11 14:56:25 +0300 |
| commit | 1b987d8518bb14a485d4c125e948adf1a654b36a (patch) | |
| tree | 54451e6de1356653000e5eea4013d3704d124f77 | |
| parent | a1a9bb7a3acaa72e8a992a8b2dbe81ad444d1ee3 (diff) | |
| parent | 55d8649b0406f66accbd4ef18557c5819cc3cc17 (diff) | |
Merge pull request #13506 from nextcloud/backport/13503/stable15
[stable15] RemoveClassifiedEventActivity: check if calendar still exists
| -rw-r--r-- | apps/dav/lib/Migration/RemoveClassifiedEventActivity.php | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/apps/dav/lib/Migration/RemoveClassifiedEventActivity.php b/apps/dav/lib/Migration/RemoveClassifiedEventActivity.php index 1f1edf285ac..ad840d8100e 100644 --- a/apps/dav/lib/Migration/RemoveClassifiedEventActivity.php +++ b/apps/dav/lib/Migration/RemoveClassifiedEventActivity.php @@ -75,6 +75,10 @@ class RemoveClassifiedEventActivity implements IRepairStep { $result = $query->execute(); while ($row = $result->fetch()) { + if ($row['principaluri'] === null) { + continue; + } + $delete->setParameter('owner', $this->getPrincipal($row['principaluri'])) ->setParameter('type', 'calendar') ->setParameter('calendar_id', $row['calendarid']) @@ -105,6 +109,10 @@ class RemoveClassifiedEventActivity implements IRepairStep { $result = $query->execute(); while ($row = $result->fetch()) { + if ($row['principaluri'] === null) { + continue; + } + $delete->setParameter('owner', $this->getPrincipal($row['principaluri'])) ->setParameter('type', 'calendar') ->setParameter('calendar_id', $row['calendarid']) |