diff options
| -rw-r--r-- | apps/dav/lib/CardDAV/Converter.php | 4 | ||||
| -rw-r--r-- | apps/dav/lib/CardDAV/SyncService.php | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/apps/dav/lib/CardDAV/Converter.php b/apps/dav/lib/CardDAV/Converter.php index 8452810c29e..340e3127f0a 100644 --- a/apps/dav/lib/CardDAV/Converter.php +++ b/apps/dav/lib/CardDAV/Converter.php @@ -47,14 +47,12 @@ class Converter { $userProperties = $this->accountManager->getAccount($user)->getProperties(); $uid = $user->getUID(); - $backendClassName = $user->getBackendClassName(); $cloudId = $user->getCloudId(); $image = $this->getAvatarImage($user); $vCard = new VCard(); $vCard->VERSION = '3.0'; - $vCard->UID = md5("$backendClassName:$uid"); - $vCard->add(new Text($vCard, 'X-NEXTCLOUD-UID', $uid)); + $vCard->UID = $uid; $publish = false; diff --git a/apps/dav/lib/CardDAV/SyncService.php b/apps/dav/lib/CardDAV/SyncService.php index d73ec9029f9..da798c5768e 100644 --- a/apps/dav/lib/CardDAV/SyncService.php +++ b/apps/dav/lib/CardDAV/SyncService.php @@ -274,7 +274,7 @@ class SyncService { $allCards = $this->backend->getCards($systemAddressBook['id']); foreach ($allCards as $card) { $vCard = Reader::read($card['carddata']); - $uid = isset($vCard->{'X-NEXTCLOUD-UID'}) ? $vCard->{'X-NEXTCLOUD-UID'}->getValue() : $vCard->UID->getValue(); + $uid = $vCard->UID->getValue(); // load backend and see if user exists if (!$this->userManager->userExists($uid)) { $this->deleteUser($card['uri']); |