]> git.mxchange.org Git - friendica.git/commitdiff
Fix: The acl lookup now works in multi threaded posts as well
authorHypolite Petovan <mrpetovan@gmail.com>
Mon, 12 Mar 2018 12:15:59 +0000 (08:15 -0400)
committerHypolite Petovan <mrpetovan@gmail.com>
Mon, 12 Mar 2018 12:15:59 +0000 (08:15 -0400)
mod/acl.php

index 11d9e5683a76a9014802c527e3d0cba8d49fa9ad..817a026553b42ad78788be0c600cb07fbf9d7cb5 100644 (file)
@@ -32,7 +32,7 @@ function acl_content(App $a)
                $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) . "%%'";
@@ -239,6 +239,12 @@ function acl_content(App $a)
        $items = array_merge($groups, $contacts);
 
        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
                 * but first get known contacts url to filter them out