Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-18 19:03:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #8969 from annando/fix-acl-search

Browse source 
Contact search is fixed
This commit is contained in:
Tobias Diekershoff 2020-08-04 10:37:00 +02:00 committed by GitHub
commit 1424e487a3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/Module/Search/Acl.php
View file

@ -56,7 +56,6 @@ class Acl extends BaseModule
} }
$type = $_REQUEST['type'] ?? self::TYPE_MENTION_CONTACT_GROUP; $type = $_REQUEST['type'] ?? self::TYPE_MENTION_CONTACT_GROUP;
if ($type === self::TYPE_GLOBAL_CONTACT) { if ($type === self::TYPE_GLOBAL_CONTACT) {
$o = self::globalContactSearch(); $o = self::globalContactSearch();
} else { } else {
@ -81,7 +80,7 @@ class Acl extends BaseModule
$contacts[] = [ $contacts[] = [
'photo' => Contact::getMicro($contact), 'photo' => Contact::getMicro($contact),
'name' => htmlspecialchars($contact['name']), 'name' => htmlspecialchars($contact['name']),
'nick' => $contact['nick'], 'nick' => $contact['addr'] ?: $contact['url'],
'network' => $contact['network'], 'network' => $contact['network'],
'link' => $contact['url'], 'link' => $contact['url'],
'forum' => $contact['contact-type'] == Contact::TYPE_COMMUNITY, 'forum' => $contact['contact-type'] == Contact::TYPE_COMMUNITY,