diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2019-01-11 14:06:47 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-11 14:06:47 +0300 |
| commit | fabcb1ff2c04be5c41c4d2237da528ac37cabdbf (patch) | |
| tree | f18861d40016951cf3e14c42ecc640f59e26344f | |
| parent | 6be08ad0deacc90b7508db010db0cfd218050fb5 (diff) | |
| parent | a719325a172fa9a9887a8d255fb16d1d34e32df3 (diff) | |
Merge pull request #13508 from nextcloud/backport/13503/stable13
[stable13] 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 07f77e57c25..0b6a4b1144c 100644 --- a/apps/dav/lib/Migration/RemoveClassifiedEventActivity.php +++ b/apps/dav/lib/Migration/RemoveClassifiedEventActivity.php @@ -74,6 +74,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']) @@ -104,6 +108,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']) |