X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Facl_selectors.php;h=71a42478ba92c06b80c02f6f3d332af6382deba4;hb=eff4ad2e0ac70bc8a07a7c335d503197e7b26c70;hp=fc3df52327103d6fa56ce18936af685eceb6b4a9;hpb=7d531afd00de35ef55d0cc5caa63242765341dae;p=friendica.git diff --git a/include/acl_selectors.php b/include/acl_selectors.php index fc3df52327..71a42478ba 100644 --- a/include/acl_selectors.php +++ b/include/acl_selectors.php @@ -399,7 +399,7 @@ function acl_lookup(&$a, $out_type = 'json') { $count = (x($_REQUEST,'count') ? $_REQUEST['count'] : 100); $search = (x($_REQUEST,'search') ? $_REQUEST['search'] : ""); $type = (x($_REQUEST,'type') ? $_REQUEST['type'] : ""); - $mode = (x($_REQUEST,'mode') ? $_REQUEST['mode'] : ""); + $mode = (x($_REQUEST,'smode') ? $_REQUEST['smode'] : ""); $conv_id = (x($_REQUEST,'conversation') ? $_REQUEST['conversation'] : null); // For use with jquery.textcomplete for private mail completion @@ -481,11 +481,11 @@ function acl_lookup(&$a, $out_type = 'json') { if ($type=='' || $type=='g'){ $r = q("SELECT `group`.`id`, `group`.`name`, GROUP_CONCAT(DISTINCT `group_member`.`contact-id` SEPARATOR ',') AS uids - FROM `group`,`group_member` - WHERE `group`.`deleted` = 0 AND `group`.`uid` = %d - AND `group_member`.`gid`=`group`.`id` + FROM `group` + INNER JOIN `group_member` ON `group_member`.`gid`=`group`.`id` AND `group_member`.`uid` = `group`.`uid` + WHERE NOT `group`.`deleted` AND `group`.`uid` = %d $sql_extra - GROUP BY `group`.`id` + GROUP BY `group`.`name` ORDER BY `group`.`name` LIMIT %d,%d", intval(local_user()), @@ -690,7 +690,7 @@ function navbar_complete(&$a) { $localsearch = get_config('system','poco_local_search'); $search = $prefix.notags(trim($_REQUEST['search'])); - $mode = $_REQUEST['mode']; + $mode = $_REQUEST['smode']; // don't search if search term has less than 2 characters if(! $search || mb_strlen($search) < 2)