diff options
| author | Lukas Reschke <lukas@statuscode.ch> | 2016-09-29 21:59:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-29 21:59:05 +0200 |
| commit | 938b0d5597c899e6f9a1026ae5593d750412c6bf (patch) | |
| tree | 09fc356dfdf4aebae9fd8d2dd02f05a3726208e1 | |
| parent | 7546f1b417b7a00cba9235b0138dc7b0be43d130 (diff) | |
| parent | 60cab0d73e4f773ea4876ff88611911e552842d4 (diff) | |
| download | nextcloud-server-938b0d5597c899e6f9a1026ae5593d750412c6bf.tar.gz nextcloud-server-938b0d5597c899e6f9a1026ae5593d750412c6bf.zip | |
Merge pull request #1580 from nextcloud/downstream-26243
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; } |