diff options
| author | Joas Schilling <213943+nickvergessen@users.noreply.github.com> | 2023-02-24 09:00:24 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-24 09:00:24 +0100 |
| commit | e884498869edee2bcaceaf8a3cd1b35981fccc40 (patch) | |
| tree | 4937738dc561dc62bf47b6eb207a299490574dcd | |
| parent | 193e51d7bff742b12742227d97a97592ca0a0d7c (diff) | |
| parent | f2885b3378f0af0ad141fb5fa15d5637122af390 (diff) | |
| download | nextcloud-server-e884498869edee2bcaceaf8a3cd1b35981fccc40.tar.gz nextcloud-server-e884498869edee2bcaceaf8a3cd1b35981fccc40.zip | |
Merge pull request #36752 from nextcloud/backport/36735/stable25
[stable25] fix the contacts-menu vcf-contact avatars
| -rw-r--r-- | lib/private/Contacts/ContactsMenu/ContactsStore.php | 8 | ||||
| -rw-r--r-- | tests/lib/Contacts/ContactsMenu/ContactsStoreTest.php | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/lib/private/Contacts/ContactsMenu/ContactsStore.php b/lib/private/Contacts/ContactsMenu/ContactsStore.php index a0a14cd9cbd..3a75e924d24 100644 --- a/lib/private/Contacts/ContactsMenu/ContactsStore.php +++ b/lib/private/Contacts/ContactsMenu/ContactsStore.php @@ -287,7 +287,13 @@ class ContactsStore implements IContactsStore { if (isset($contact['UID'])) { $uid = $contact['UID']; $entry->setId($uid); - $avatar = $this->urlGenerator->linkToRouteAbsolute('core.avatar.getAvatar', ['userId' => $uid, 'size' => 64]); + if (isset($contact['isLocalSystemBook'])) { + $avatar = $this->urlGenerator->linkToRouteAbsolute('core.avatar.getAvatar', ['userId' => $uid, 'size' => 64]); + } elseif (isset($contact['FN'])) { + $avatar = $this->urlGenerator->linkToRouteAbsolute('core.GuestAvatar.getAvatar', ['guestName' => $contact['FN'], 'size' => 64]); + } else { + $avatar = $this->urlGenerator->linkToRouteAbsolute('core.GuestAvatar.getAvatar', ['guestName' => $uid, 'size' => 64]); + } $entry->setAvatar($avatar); } diff --git a/tests/lib/Contacts/ContactsMenu/ContactsStoreTest.php b/tests/lib/Contacts/ContactsMenu/ContactsStoreTest.php index dfdd67fbb23..aab28eb22b2 100644 --- a/tests/lib/Contacts/ContactsMenu/ContactsStoreTest.php +++ b/tests/lib/Contacts/ContactsMenu/ContactsStoreTest.php @@ -142,7 +142,7 @@ class ContactsStoreTest extends TestCase { $user = $this->createMock(IUser::class); $this->urlGenerator->expects($this->any()) ->method('linkToRouteAbsolute') - ->with('core.avatar.getAvatar', $this->anything()) + ->with('core.GuestAvatar.getAvatar', $this->anything()) ->willReturn('https://urlToNcAvatar.test'); $this->contactsManager->expects($this->once()) ->method('search') |