Merge pull request #4634 from tobiasd/20180319-de

[friendica.git] / include / acl_selectors.php

diff --git a/include/acl_selectors.php b/include/acl_selectors.php
index dd8864a631798302af0b04b02781f2f6e11f3ab3..91f94155900adba71fbd74e3cb356340c2ea9465 100644 (file)
--- a/include/acl_selectors.php
+++ b/include/acl_selectors.php
@@ -186,9 +186,6 @@ function contact_selector($selname, $selclass, $options, $preselected = false)
 
 
 function contact_select($selname, $selclass, $preselected = false, $size = 4, $privmail = false, $celeb = false, $privatenet = false, $tabindex = null) {
-
-       require_once "include/bbcode.php";
-
        $a = get_app();
 
        $o = '';
@@ -409,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)."%%'";
@@ -616,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