Merge pull request #1719 from nextcloud/stable9-backport-1580

nickvergessen · web-flow · commit 55f5f5061d3b · 2016-10-12T13:13:48.000+02:00
[stable9] Unset user PHOTO before setting new one in OCA\DAV\CardDAV\Converter:…
diff --git a/apps/dav/lib/carddav/converter.php b/apps/dav/lib/carddav/converter.php
@@ -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;
 		}

Original file line number	Diff line number	Diff line change
`@@ -92,6 +92,7 @@ public function updateCard(VCard $vCard, IUser $user) {`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`if($this->propertyNeedsUpdate($vCard, 'PHOTO', $image)) {`
	`95`	`+ unset($vCard->PHOTO);`
`95`	`96`	`$vCard->add('PHOTO', $image->data(), ['ENCODING' => 'b', 'TYPE' => $image->mimeType()]);`
`96`	`97`	`$updated = true;`
`97`	`98`	`}`