Merge pull request #3373 from strk/expire-login-later

[friendica.git] / include / acl_selectors.php

diff --git a/include/acl_selectors.php b/include/acl_selectors.php
index 421868ea16187942753c7f821f457b47eaefcc12..f57af575afa3091124e3dff1716d6b288c6c62fe 100644 (file)
--- a/include/acl_selectors.php
+++ b/include/acl_selectors.php
@@ -519,7 +519,7 @@ function acl_lookup(App $a, $out_type = 'json') {
                                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`.`name`
+                               GROUP BY `group`.`name`, `group`.`id`
                                ORDER BY `group`.`name`
                                LIMIT %d,%d",
                        intval(local_user()),
@@ -640,7 +640,7 @@ function acl_lookup(App $a, $out_type = 'json') {
                                FROM `item` WHERE `parent` = %d
                                        AND (`author-name` LIKE '%%%s%%' OR `author-link` LIKE '%%%s%%')
                                        AND `author-link` NOT IN ('%s')
-                               GROUP BY `author-link`
+                               GROUP BY `author-link`, `author-avatar`, `author-name`
                                ORDER BY `author-name` ASC
                                ",
                                intval($conv_id),