Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-10 04:22:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #10881 from MrPetovan/bug/10872-acl-mail-contacts

Browse source 
Switch available contact selection to private-supporting networks in ACL
This commit is contained in:
Michael Vogel 2021-10-17 08:32:19 +02:00 committed by GitHub
commit dec87d89c0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Core/ACL.php
View file

@ -62,8 +62,6 @@ class ACL
$page->registerStylesheet(Theme::getPathForFile('js/friendica-tagsinput/friendica-tagsinput.css')); $page->registerStylesheet(Theme::getPathForFile('js/friendica-tagsinput/friendica-tagsinput.css'));
$page->registerStylesheet(Theme::getPathForFile('js/friendica-tagsinput/friendica-tagsinput-typeahead.css')); $page->registerStylesheet(Theme::getPathForFile('js/friendica-tagsinput/friendica-tagsinput-typeahead.css'));
// When used for private messages, we limit correspondence to mutual DFRN/Friendica friends and the selector
// to one recipient. By default our selector allows multiple selects amongst all contacts.
$condition = [ $condition = [
'uid' => local_user(), 'uid' => local_user(),
'self' => false, 'self' => false,
@ -72,7 +70,7 @@ class ACL
'archive' => false, 'archive' => false,
'deleted' => false, 'deleted' => false,
'rel' => [Contact::FOLLOWER, Contact::SHARING, Contact::FRIEND], 'rel' => [Contact::FOLLOWER, Contact::SHARING, Contact::FRIEND],
'network' => Protocol::FEDERATED, 'network' => Protocol::SUPPORT_PRIVATE,
]; ];
$contacts = Contact::selectToArray( $contacts = Contact::selectToArray(