X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Facl_selectors.php;h=7a488ca40bb6511b211ea57c2d45703373787e9a;hb=d0d4e3813b063978b3f9e17577fc9b1ab984c9d0;hp=f971d462b2109f9f9877adab0fe84e5e6b3e6d09;hpb=b1d16fbdf7db1ec67179ad3f3869af4d16e0a38d;p=friendica.git diff --git a/include/acl_selectors.php b/include/acl_selectors.php index f971d462b2..7a488ca40b 100644 --- a/include/acl_selectors.php +++ b/include/acl_selectors.php @@ -6,8 +6,8 @@ use Friendica\App; use Friendica\Content\Feature; use Friendica\Core\Config; use Friendica\Database\DBM; -use Friendica\Model\GlobalContact; -use Friendica\Object\Contact; +use Friendica\Model\Contact; +use Friendica\Model\GContact; require_once "include/contact_selectors.php"; require_once "include/contact_widgets.php"; @@ -529,7 +529,7 @@ function acl_lookup(App $a, $out_type = 'json') { // This can be done when we can delete cache entries via wildcard $r = q("SELECT `group`.`id`, `group`.`name`, GROUP_CONCAT(DISTINCT `group_member`.`contact-id` SEPARATOR ',') AS uids FROM `group` - INNER JOIN `group_member` ON `group_member`.`gid`=`group`.`id` AND `group_member`.`uid` = `group`.`uid` + INNER JOIN `group_member` ON `group_member`.`gid`=`group`.`id` WHERE NOT `group`.`deleted` AND `group`.`uid` = %d $sql_extra GROUP BY `group`.`name`, `group`.`id` @@ -774,7 +774,7 @@ function navbar_complete(App $a) { } if ($localsearch) { - $x = GlobalContact::searchByName($search, $mode); + $x = GContact::searchByName($search, $mode); return $x; }