diff options
| author | Roeland Jago Douma <roeland@famdouma.nl> | 2018-12-04 13:33:03 +0100 |
|---|---|---|
| committer | Backportbot <backportbot-noreply@rullzer.com> | 2018-12-04 14:21:51 +0000 |
| commit | 094b98376f662f2459f2831664d23a9277bc5a9a (patch) | |
| tree | a4eb7b744fef16da4b06f23534ffa9ff705357bb | |
| parent | 0d5f3d16e905132080d53e175e993516576b0b87 (diff) | |
| download | nextcloud-server-094b98376f662f2459f2831664d23a9277bc5a9a.tar.gz nextcloud-server-094b98376f662f2459f2831664d23a9277bc5a9a.zip | |
Fix the system address book
c23a66cda46d9a1f0ce8dc60a6c160809c87d9f6 broke the system address book.
We now move the ACL rules for this special case up and all is good in
the world again.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| -rw-r--r-- | apps/dav/lib/CardDAV/AddressBook.php | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/apps/dav/lib/CardDAV/AddressBook.php b/apps/dav/lib/CardDAV/AddressBook.php index 30ce0a3253c..096f5c8b2a9 100644 --- a/apps/dav/lib/CardDAV/AddressBook.php +++ b/apps/dav/lib/CardDAV/AddressBook.php @@ -112,6 +112,14 @@ class AddressBook extends \Sabre\CardDAV\AddressBook implements IShareable { ] ]; + if ($this->getOwner() === 'principals/system/system') { + $acl[] = [ + 'privilege' => '{DAV:}read', + 'principal' => '{DAV:}authenticated', + 'protected' => true, + ]; + } + if (!$this->isShared()) { return $acl; } @@ -130,13 +138,6 @@ class AddressBook extends \Sabre\CardDAV\AddressBook implements IShareable { ]; } } - if ($this->getOwner() === 'principals/system/system') { - $acl[] = [ - 'privilege' => '{DAV:}read', - 'principal' => '{DAV:}authenticated', - 'protected' => true, - ]; - } $acl = $this->carddavBackend->applyShareAcl($this->getResourceId(), $acl); $allowedPrincipals = [$this->getOwner(), parent::getOwner(), 'principals/system/system']; |