friendica
/
friendica
mirror of https://git.friendi.ca/friendica/friendica.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #4587 from annando/acl-thread 

Fix: The acl lookup now works in multi threaded posts as well
pull/4589/head
Tobias Diekershoff 2018-03-12 07:55:23 +01:00 committed by GitHub
parent 03079acf79 4bb9263e43
commit 306dd382f3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/acl_selectors.php
View File

@ -406,7 +406,7 @@ function acl_lookup(App $a, $out_type = 'json')
$search = $_REQUEST['query'];
}
logger("Searching for ".$search." - type ".$type, LOGGER_DEBUG);
logger("Searching for ".$search." - type ".$type." conversation ".$conv_id, LOGGER_DEBUG);
if ($search != '') {
$sql_extra = "AND `name` LIKE '%%".dbesc($search)."%%'";
@ -613,6 +613,14 @@ function acl_lookup(App $a, $out_type = 'json')
$items = array_merge($groups, $contacts);
// At multi threaded posts the conv_id is not the parent of the whole thread
if ($conv_id > 0) {
$parent_item = dba::selectFirst('item', ['parent'], ['id' => $conv_id]);
if (DBM::is_result($parent_item)) {
$conv_id = $parent_item['parent'];
}
}
if ($conv_id) {
/*
* if $conv_id is set, get unknown contacts in thread