Skip to content

[stable10] Unset user PHOTO before setting new one in OCA\DAV\CardDAV\Converter:… #1717

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nickvergessen merged 1 commit into from
Oct 12, 2016
Merged

[stable10] Unset user PHOTO before setting new one in OCA\DAV\CardDAV\Converter:… #1717

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Unset user PHOTO before setting new one in OCA\DAV\CardDAV\Converter:… 
…:updateCard (#26243)

Signed-off-by: Olivier Mehani <[email protected]>

#26242
  • Loading branch information
@shtrom @MorrisJobke
shtrom authored and MorrisJobke committed Oct 12, 2016
commit 99f7315ed5a63d41dd0b053b56e26ef26aa9963c
1 change: 1 addition & 0 deletions apps/dav/lib/CardDAV/Converter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ public function updateCard(VCard $vCard, IUser $user) {
}

if($this->propertyNeedsUpdate($vCard, 'PHOTO', $image)) {
unset($vCard->PHOTO);
$vCard->add('PHOTO', $image->data(), ['ENCODING' => 'b', 'TYPE' => $image->mimeType()]);
$updated = true;
}
Expand Down