Skip to content

Fix contact photos after #32057 #36110

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

Closed
Pytal wants to merge 2 commits into from
Closed

Fix contact photos after #32057 #36110

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e15add8
Fix contact photos
Pytal Jan 12, 2023
39f6818
Map the X-NEXTCLOUD-UID contact property to the UID property of IEntry
nickvergessen Jan 12, 2023
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
4 changes: 2 additions & 2 deletions lib/private/Contacts/ContactsMenu/ContactsStore.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,8 +284,8 @@ public function findOne(IUser $user, int $shareType, string $shareWith): ?IEntry
private function contactArrayToEntry(array $contact): Entry {
$entry = new Entry();

if (isset($contact['UID'])) {
$uid = $contact['UID'];
$uid = $contact['X-NEXTCLOUD-UID'] ?? $contact['UID'];
if (isset($uid)) {
$entry->setId($uid);
$avatar = $this->urlGenerator->linkToRouteAbsolute('core.avatar.getAvatar', ['userId' => $uid, 'size' => 64]);
$entry->setAvatar($avatar);
Expand Down