From e6371134523b6c263b37dd70878e7256cef53ecc Mon Sep 17 00:00:00 2001 From: Bjoern Schiessle Date: Mon, 13 Mar 2017 14:58:37 +0100 Subject: don't add empty values to the vcard Signed-off-by: Bjoern Schiessle --- apps/dav/lib/CardDAV/Converter.php | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'apps/dav/lib') diff --git a/apps/dav/lib/CardDAV/Converter.php b/apps/dav/lib/CardDAV/Converter.php index 0f8ea799f1e..eb43fe7d671 100644 --- a/apps/dav/lib/CardDAV/Converter.php +++ b/apps/dav/lib/CardDAV/Converter.php @@ -61,9 +61,15 @@ class Converter { $publish = false; foreach ($userData as $property => $value) { - if ($value['scope'] === AccountManager::VISIBILITY_CONTACTS_ONLY || - $value['scope'] === AccountManager::VISIBILITY_PUBLIC - ) { + + $shareWithTrustedServers = + $value['scope'] === AccountManager::VISIBILITY_CONTACTS_ONLY || + $value['scope'] === AccountManager::VISIBILITY_PUBLIC; + + $emptyValue = !isset($value['value']) || $value['value'] === ''; + $noImage = $image === null; + + if ($shareWithTrustedServers && (!$emptyValue || !$noImage)) { $publish = true; switch ($property) { case AccountManager::PROPERTY_DISPLAYNAME: -- cgit v1.2.3