summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorOlivier Mehani <shtrom-github@ssji.net>2016-09-29 20:39:36 +1000
committerMorris Jobke <hey@morrisjobke.de>2016-09-29 17:09:24 +0200
commit60cab0d73e4f773ea4876ff88611911e552842d4 (patch)
treefedbfe99bd18db52f5824b89e926c1eaee1eba5f /apps
parent8a14f4a8990e2659bc42cb65c77fce9a5d4fa96f (diff)
downloadnextcloud-server-60cab0d73e4f773ea4876ff88611911e552842d4.tar.gz
nextcloud-server-60cab0d73e4f773ea4876ff88611911e552842d4.zip
Unset user PHOTO before setting new one in OCA\DAV\CardDAV\Converter::updateCard (#26243)
Signed-off-by: Olivier Mehani <shtrom@ssji.net> #26242
Diffstat (limited to 'apps')
-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 69c96f5ed65..0f4a6fb3f08 100644
--- a/apps/dav/lib/CardDAV/Converter.php
+++ b/apps/dav/lib/CardDAV/Converter.php
@@ -92,6 +92,7 @@ class Converter {
}
if($this->propertyNeedsUpdate($vCard, 'PHOTO', $image)) {
+ unset($vCard->PHOTO);
$vCard->add('PHOTO', $image->data(), ['ENCODING' => 'b', 'TYPE' => $image->mimeType()]);
$updated = true;
}