Merge pull request #7456 from nextcloud/12_7342

[stable12] CardDAV convertor check should not be to wide
nextcloud · Dec 12, 2017 · f44d5bd · f44d5bd
2 parents 4b60ada + dfed58e
commit f44d5bd
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/apps/dav/lib/CardDAV/Converter.php b/apps/dav/lib/CardDAV/Converter.php
@@ -60,16 +60,19 @@ public function createCardFromUser(IUser $user) {
 
 		$publish = false;
 
+		if ($image !== null && isset($userData[AccountManager::PROPERTY_AVATAR])) {
+			$userData[AccountManager::PROPERTY_AVATAR]['value'] = true;
+		}
+
 		foreach ($userData as $property => $value) {
 
 			$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)) {
+			if ($shareWithTrustedServers && !$emptyValue) {
 				$publish = true;
 				switch ($property) {
 					case AccountManager::PROPERTY_DISPLAYNAME: