Merge pull request #7342 from nextcloud/fix_carddav_converter
CardDAV convertor check should not be to wide
This commit is contained in:
commit
80b27fdb93
|
@ -61,6 +61,10 @@ class Converter {
|
||||||
|
|
||||||
$publish = false;
|
$publish = false;
|
||||||
|
|
||||||
|
if ($image !== null && isset($userData[AccountManager::PROPERTY_AVATAR])) {
|
||||||
|
$userData[AccountManager::PROPERTY_AVATAR]['value'] = true;
|
||||||
|
}
|
||||||
|
|
||||||
foreach ($userData as $property => $value) {
|
foreach ($userData as $property => $value) {
|
||||||
|
|
||||||
$shareWithTrustedServers =
|
$shareWithTrustedServers =
|
||||||
|
@ -68,9 +72,8 @@ class Converter {
|
||||||
$value['scope'] === AccountManager::VISIBILITY_PUBLIC;
|
$value['scope'] === AccountManager::VISIBILITY_PUBLIC;
|
||||||
|
|
||||||
$emptyValue = !isset($value['value']) || $value['value'] === '';
|
$emptyValue = !isset($value['value']) || $value['value'] === '';
|
||||||
$noImage = $image === null;
|
|
||||||
|
|
||||||
if ($shareWithTrustedServers && (!$emptyValue || !$noImage)) {
|
if ($shareWithTrustedServers && !$emptyValue) {
|
||||||
$publish = true;
|
$publish = true;
|
||||||
switch ($property) {
|
switch ($property) {
|
||||||
case AccountManager::PROPERTY_DISPLAYNAME:
|
case AccountManager::PROPERTY_DISPLAYNAME:
|
||||||
|
|
Loading…
Reference in New Issue