Skip to content

[stable15] Allow URI as data for vcard PHOTO #13366

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
MorrisJobke merged 3 commits into from
Jan 4, 2019
Merged

[stable15] Allow URI as data for vcard PHOTO #13366

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a47df39
Allow URI as data for vcard PHOTO
skjnldsv Dec 17, 2018
d36f1d9
Log failure on parsing
skjnldsv Dec 17, 2018
53b0903
Update apps/dav/lib/CardDAV/PhotoCache.php
MorrisJobke Jan 4, 2019
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
Prev Previous commit
Update apps/dav/lib/CardDAV/PhotoCache.php 
Signed-off-by: John Molakvoæ (skjnldsv) <[email protected]>

Co-Authored-By: skjnldsv <[email protected]>
  • Loading branch information
@MorrisJobke @skjnldsv
2 people authored and Backportbot committed Jan 4, 2019
commit 53b09033aefe21fc7804261bf2c9b2e01b076a35
2 changes: 1 addition & 1 deletion apps/dav/lib/CardDAV/PhotoCache.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ private function getPhoto(Card $node) {
'body' => $val
];
} catch (\Exception $e) {
$this->logger->logException($ex, [
$this->logger->logException($e, [
'message' => 'Exception during vcard photo parsing'
]);
}
Expand Down