Skip to content

Commit b281764

Browse files
committed
fix(contacts): not contact, not local
Signed-off-by: Maxence Lange <[email protected]>
1 parent 22ca454 commit b281764

File tree

5 files changed

+5
-6
lines changed

5 files changed

+5
-6
lines changed

apps/files/lib/Activity/Provider.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -501,7 +501,7 @@ protected function getDisplayNameFromAddressBook(string $search): string {
501501
'strict_search' => true,
502502
]);
503503
foreach ($addressBookContacts as $contact) {
504-
if (isset($contact['isLocalSystemBook'])) {
504+
if (isset($contact['isLocalSystemBook']) || isset($contact['isVirtualAddressbook'])) {
505505
continue;
506506
}
507507

apps/files_sharing/lib/Activity/Providers/Base.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ protected function getDisplayNameFromAddressBook(string $search): string {
160160
'strict_search' => true,
161161
]);
162162
foreach ($addressBookContacts as $contact) {
163-
if (isset($contact['isLocalSystemBook'])) {
163+
if (isset($contact['isLocalSystemBook']) || isset($contact['isVirtualAddressbook'])) {
164164
continue;
165165
}
166166

apps/sharebymail/lib/Activity.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ protected function getContactName($email) {
287287
]);
288288

289289
foreach ($addressBookContacts as $contact) {
290-
if (isset($contact['isLocalSystemBook'])) {
290+
if (isset($contact['isLocalSystemBook']) || isset($contact['isVirtualAddressbook'])) {
291291
continue;
292292
}
293293

lib/private/Collaboration/Collaborators/RemotePlugin.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public function search($search, $limit, $offset, ISearchResult $searchResult): b
4949
'fullmatch' => false,
5050
]);
5151
foreach ($addressBookContacts as $contact) {
52-
if (isset($contact['isLocalSystemBook'])) {
52+
if (isset($contact['isLocalSystemBook']) || isset($contact['isVirtualAddressbook'])) {
5353
continue;
5454
}
5555
if (isset($contact['CLOUD'])) {

lib/private/Contacts/ContactsMenu/ContactsStore.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -305,8 +305,7 @@ public function findOne(IUser $user, int $shareType, string $shareWith): ?IEntry
305305
}
306306
}
307307
if ($shareType === 0 || $shareType === 6) {
308-
$isLocal = $contact['isLocalSystemBook'] ?? false;
309-
if ($contact['UID'] === $shareWith && $isLocal === true) {
308+
if (($contact['isLocalSystemBook'] ?? false) === true && $contact['UID'] === $shareWith) {
310309
$match = $contact;
311310
break;
312311
}

0 commit comments

Comments
 (0)