diff options
| author | blizzz <blizzz@arthur-schiwon.de> | 2017-12-11 16:03:07 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-11 16:03:07 +0100 |
| commit | 80b27fdb93ac0c170d0b5e214f67a2eff6c366ad (patch) | |
| tree | 2730f552160208602fc54d23112a16a57d68dec6 | |
| parent | 07e6387b31bcad908ba285170e086659d1ff05ef (diff) | |
| parent | 40633c5e546f7145f084ed73d894f2c5246f3428 (diff) | |
| download | nextcloud-server-80b27fdb93ac0c170d0b5e214f67a2eff6c366ad.tar.gz nextcloud-server-80b27fdb93ac0c170d0b5e214f67a2eff6c366ad.zip | |
Merge pull request #7342 from nextcloud/fix_carddav_converter
CardDAV convertor check should not be to wide
| -rw-r--r-- | apps/dav/lib/CardDAV/Converter.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/apps/dav/lib/CardDAV/Converter.php b/apps/dav/lib/CardDAV/Converter.php index c3f27c0299e..a480f0ea45d 100644 --- a/apps/dav/lib/CardDAV/Converter.php +++ b/apps/dav/lib/CardDAV/Converter.php @@ -61,6 +61,10 @@ class Converter { $publish = false; + if ($image !== null && isset($userData[AccountManager::PROPERTY_AVATAR])) { + $userData[AccountManager::PROPERTY_AVATAR]['value'] = true; + } + foreach ($userData as $property => $value) { $shareWithTrustedServers = @@ -68,9 +72,8 @@ class Converter { $value['scope'] === AccountManager::VISIBILITY_PUBLIC; $emptyValue = !isset($value['value']) || $value['value'] === ''; - $noImage = $image === null; - if ($shareWithTrustedServers && (!$emptyValue || !$noImage)) { + if ($shareWithTrustedServers && !$emptyValue) { $publish = true; switch ($property) { case AccountManager::PROPERTY_DISPLAYNAME: |