diff options
| author | Georg Ehrke <developer@georgehrke.com> | 2017-03-25 23:07:09 +0100 |
|---|---|---|
| committer | Georg Ehrke <developer@georgehrke.com> | 2017-03-25 23:07:09 +0100 |
| commit | 896dd76ab52137e190eef4d4063ceb64e469bf9b (patch) | |
| tree | 5592d690686a69ae93e6a0c5de22302d69130098 /apps/dav | |
| parent | 28b692911166e0bd911f1bc1e5c6cbc8cb1e9000 (diff) | |
| download | nextcloud-server-896dd76ab52137e190eef4d4063ceb64e469bf9b.tar.gz nextcloud-server-896dd76ab52137e190eef4d4063ceb64e469bf9b.zip | |
fix bug with shared_by for own calendars if shared
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
Diffstat (limited to 'apps/dav')
| -rw-r--r-- | apps/dav/lib/CalDAV/CalDavBackend.php | 4 | ||||
| -rw-r--r-- | apps/dav/lib/CardDAV/CardDavBackend.php | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/apps/dav/lib/CalDAV/CalDavBackend.php b/apps/dav/lib/CalDAV/CalDavBackend.php index dbe86438238..7976c1490ff 100644 --- a/apps/dav/lib/CalDAV/CalDavBackend.php +++ b/apps/dav/lib/CalDAV/CalDavBackend.php @@ -279,6 +279,10 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription $readOnlyPropertyName = '{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}read-only'; while($row = $result->fetch()) { + if ($row['principaluri'] === $principalUri) { + continue; + } + $readOnly = (int) $row['access'] === Backend::ACCESS_READ; if (isset($calendars[$row['id']])) { if ($readOnly) { diff --git a/apps/dav/lib/CardDAV/CardDavBackend.php b/apps/dav/lib/CardDAV/CardDavBackend.php index 6f9a73298ef..397a77c1d1b 100644 --- a/apps/dav/lib/CardDAV/CardDavBackend.php +++ b/apps/dav/lib/CardDAV/CardDavBackend.php @@ -174,6 +174,10 @@ class CardDavBackend implements BackendInterface, SyncSupport { $readOnlyPropertyName = '{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}read-only'; while($row = $result->fetch()) { + if ($row['principaluri'] === $principalUri) { + continue; + } + $readOnly = (int) $row['access'] === Backend::ACCESS_READ; if (isset($addressBooks[$row['id']])) { if ($readOnly) { |