nextcloud
/
server
mirror of https://github.com/nextcloud/server
0
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #33450 from sazanof/bug/base64-card-dav-search 

Fix photo url generation (add URI type to VCard2Array)
This commit is contained in:
blizzz 2022-10-01 21:50:14 +02:00 committed by GitHub
parent ca958de7e9 458f1b0c03
commit 132f842f80
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/dav/lib/CardDAV/AddressBookImpl.php
View File

@ -273,7 +273,7 @@ class AddressBookImpl implements IAddressBook {
];
foreach ($vCard->children() as $property) {
if ($property->name === 'PHOTO' && $property->getValueType() === 'BINARY') {
if ($property->name === 'PHOTO' && in_array($property->getValueType(), ['BINARY', 'URI'])) {
$url = $this->urlGenerator->getAbsoluteURL(
$this->urlGenerator->linkTo('', 'remote.php') . '/dav/');
$url .= implode('/', [