Revert adding a leading slash to redir links

[friendica.git] / include / acl_selectors.php

diff --git a/include/acl_selectors.php b/include/acl_selectors.php
index 76f0e0b79609caf74d9c1a68bd11f0bea209b654..71a42478ba92c06b80c02f6f3d332af6382deba4 100644 (file)
--- a/include/acl_selectors.php
+++ b/include/acl_selectors.php
@@ -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()),