diff options
| author | Joas Schilling <coding@schilljs.com> | 2016-10-12 13:13:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-12 13:13:48 +0200 |
| commit | 55f5f5061d3b63b3155d79f385f1b4693e60cb2a (patch) | |
| tree | d1fd275a911569a00b1b537dcaa9948fd4e46c65 | |
| parent | f82ef091508e1b266d2a4b2cbc8034ecc5cae029 (diff) | |
| parent | 69a58d539d970a9919040284aa9e8805bd98a773 (diff) | |
| download | nextcloud-server-55f5f5061d3b63b3155d79f385f1b4693e60cb2a.tar.gz nextcloud-server-55f5f5061d3b63b3155d79f385f1b4693e60cb2a.zip | |
Merge pull request #1719 from nextcloud/stable9-backport-1580
[stable9] Unset user PHOTO before setting new one in OCA\DAV\CardDAV\Converter:…
| -rw-r--r-- | apps/dav/lib/carddav/converter.php | 1 |
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; } |