Merge pull request #7456 from nextcloud/12_7342
[stable12] CardDAV convertor check should not be to wide
This commit is contained in:
commit
f44d5bde56
|
@ -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:
|
||||
|
|
Loading…
Reference in New Issue