keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix: The acl lookup now works in multi threaded posts as well

Browse source
This commit is contained in:
Hypolite Petovan 2018-03-12 08:15:59 -04:00
parent 4a0781db19
commit 83c4c86251
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
mod/acl.php
View file

@ -32,7 +32,7 @@ function acl_content(App $a)
$search = $_REQUEST['query']; $search = $_REQUEST['query'];
} }
logger('Searching for ' . $search . ' - type ' . $type, LOGGER_DEBUG); logger("Searching for ".$search." - type ".$type." conversation ".$conv_id, LOGGER_DEBUG);
if ($search != '') { if ($search != '') {
$sql_extra = "AND `name` LIKE '%%" . dbesc($search) . "%%'"; $sql_extra = "AND `name` LIKE '%%" . dbesc($search) . "%%'";
@ -239,6 +239,12 @@ function acl_content(App $a)
$items = array_merge($groups, $contacts); $items = array_merge($groups, $contacts);
if ($conv_id) { if ($conv_id) {
// In multi threaded posts the conv_id is not the parent of the whole thread
$parent_item = dba::selectFirst('item', ['parent'], ['id' => $conv_id]);
if (DBM::is_result($parent_item)) {
$conv_id = $parent_item['parent'];
}
/* /*
* if $conv_id is set, get unknown contacts in thread * if $conv_id is set, get unknown contacts in thread
* but first get known contacts url to filter them out * but first get known contacts url to filter them out