CardDAV convertor check should not be to wide

Case: email is set to null, but the avatar is set. In the old case the
email would set $emptyValue but $noImage would still be false. This we
would set the empty string as email.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

diff --git a/apps/dav/lib/CardDAV/Converter.php b/apps/dav/lib/CardDAV/Converter.php
index 9e106a0fe28cfb249e8b904b37589c74c59db7ef..fb2813fb22c3bb3e6add8096d5345d1c8707f185 100644 (file)
--- a/apps/dav/lib/CardDAV/Converter.php
+++ b/apps/dav/lib/CardDAV/Converter.php
@@ -60,6 +60,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 =
@@ -67,9 +71,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: