diff options
| author | Julius Härtl <jus@bitgrid.net> | 2018-10-17 21:16:13 +0200 |
|---|---|---|
| committer | Julius Härtl <jus@bitgrid.net> | 2018-10-30 10:19:33 +0100 |
| commit | 45d8aeb9f2708cc53473d8a344a1a8fe6a0331bc (patch) | |
| tree | d58e957f369dbacfcdab9a1b286bce74fc956202 /apps | |
| parent | 6dde7e1183f0f5210b9d6de1e36ea7e15e58348b (diff) | |
| download | nextcloud-server-45d8aeb9f2708cc53473d8a344a1a8fe6a0331bc.tar.gz nextcloud-server-45d8aeb9f2708cc53473d8a344a1a8fe6a0331bc.zip | |
Remove federated sharing address books which are the same as local ones
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/dav/lib/CardDAV/AddressBookImpl.php | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/apps/dav/lib/CardDAV/AddressBookImpl.php b/apps/dav/lib/CardDAV/AddressBookImpl.php index 5034b16ed2f..a592b9f0888 100644 --- a/apps/dav/lib/CardDAV/AddressBookImpl.php +++ b/apps/dav/lib/CardDAV/AddressBookImpl.php @@ -262,8 +262,12 @@ class AddressBookImpl implements IAddressBook { } } - if ($this->addressBookInfo['principaluri'] === 'principals/system/system' && - $this->addressBookInfo['uri'] === 'system') { + if ( + $this->addressBookInfo['principaluri'] === 'principals/system/system' && ( + $this->addressBookInfo['uri'] === 'system' || + $this->addressBookInfo['{DAV:}displayname'] === $this->urlGenerator->getBaseUrl() + ) + ) { $result['isLocalSystemBook'] = true; } return $result; |