Merge pull request #7503 from MrPetovan/bug/fix-private-permissions

Use contact.network field instead of contact.protocol in Group::expand
2022.09-rc
Philipp 2019-08-11 23:26:34 +02:00 zatwierdzone przez GitHub
commit 541cdcd515
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
1 zmienionych plików z 2 dodań i 2 usunięć

Wyświetl plik

@ -334,7 +334,7 @@ class Group extends BaseObject
$followers = Contact::selectToArray(['id'], [ $followers = Contact::selectToArray(['id'], [
'uid' => $uid, 'uid' => $uid,
'rel' => [Contact::FOLLOWER, Contact::FRIEND], 'rel' => [Contact::FOLLOWER, Contact::FRIEND],
'protocol' => Protocol::SUPPORT_PRIVATE, 'network' => Protocol::SUPPORT_PRIVATE,
]); ]);
foreach ($followers as $follower) { foreach ($followers as $follower) {
@ -349,7 +349,7 @@ class Group extends BaseObject
$mutuals = Contact::selectToArray(['id'], [ $mutuals = Contact::selectToArray(['id'], [
'uid' => $uid, 'uid' => $uid,
'rel' => [Contact::FRIEND], 'rel' => [Contact::FRIEND],
'protocol' => Protocol::SUPPORT_PRIVATE, 'network' => Protocol::SUPPORT_PRIVATE,
]); ]);
foreach ($mutuals as $mutual) { foreach ($mutuals as $mutual) {