diff options
| author | Bjoern Schiessle <bjoern@schiessle.org> | 2017-03-13 14:58:37 +0100 |
|---|---|---|
| committer | Bjoern Schiessle <bjoern@schiessle.org> | 2017-03-24 11:06:44 +0100 |
| commit | e6371134523b6c263b37dd70878e7256cef53ecc (patch) | |
| tree | a2d02506454a0d01943162043ad523f4e1565ace /apps/dav/lib/CardDAV | |
| parent | 4531b4a81da81c8f1b6eb49b2669fa93088e33d9 (diff) | |
| download | nextcloud-server-e6371134523b6c263b37dd70878e7256cef53ecc.tar.gz nextcloud-server-e6371134523b6c263b37dd70878e7256cef53ecc.zip | |
don't add empty values to the vcard
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
Diffstat (limited to 'apps/dav/lib/CardDAV')
| -rw-r--r-- | apps/dav/lib/CardDAV/Converter.php | 12 |
1 files changed, 9 insertions, 3 deletions
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: |