summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Müller <DeepDiver1975@users.noreply.github.com>2016-09-30 11:34:10 +0200
committerGitHub <noreply@github.com>2016-09-30 11:34:10 +0200
commit058c79a3581bb1d9d24518781c63d86d95a0af70 (patch)
treefbb0ca4ea8e20d065d191c510ff5f341b023b5e9
parent1b38cee3f322ae1ec8ab9cae8fbae85417c26748 (diff)
downloadnextcloud-server-058c79a3581bb1d9d24518781c63d86d95a0af70.tar.gz
nextcloud-server-058c79a3581bb1d9d24518781c63d86d95a0af70.zip
[stable9.1] Unset user PHOTO before setting new one in OCA\DAV\CardDAV\Converter::updateCard (#26243) (#26246)
Signed-off-by: Olivier Mehani <shtrom@ssji.net> #26242
-rw-r--r--apps/dav/lib/CardDAV/Converter.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/apps/dav/lib/CardDAV/Converter.php b/apps/dav/lib/CardDAV/Converter.php
index f64b6c6b769..49feba4316b 100644
--- a/apps/dav/lib/CardDAV/Converter.php
+++ b/apps/dav/lib/CardDAV/Converter.php
@@ -91,6 +91,7 @@ class Converter {
}
if($this->propertyNeedsUpdate($vCard, 'PHOTO', $image)) {
+ unset($vCard->PHOTO);
$vCard->add('PHOTO', $image->data(), ['ENCODING' => 'b', 'TYPE' => $image->mimeType()]);
$updated = true;
}