Remove federated sharing address books which are the same as local ones

Signed-off-by: Julius Härtl <jus@bitgrid.net>
7 years ago · 45d8aeb9f2
parent 6dde7e1183
commit 45d8aeb9f2
1 changed files with 6 additions and 2 deletions
--- 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;