Bugfix: The ACL lookup had its problems after the last changes

diff --git a/include/acl_selectors.php b/include/acl_selectors.php
index ca463d9433f5868004ea543ad4d669ca3df5f07c..8205854ba6ef2c0a7a4b6ebd062a0f40c1eff5ae 100644 (file)
--- a/include/acl_selectors.php
+++ b/include/acl_selectors.php
@@ -546,7 +546,7 @@ function acl_lookup(App $a, $out_type = 'json') {
                                "forum" => '0'
                        );
                }
-               if (count($groups) > 0) {
+               if ((count($groups) > 0) && ($search == "")) {
                        $groups[] = array("separator" => true);
                }
        }
@@ -557,7 +557,7 @@ function acl_lookup(App $a, $out_type = 'json') {
                        WHERE `uid` = %d AND NOT `self` AND NOT `blocked` AND NOT `pending` AND NOT `archive` AND `notify` != ''
                        AND `success_update` >= `failure_update` AND NOT (`network` IN ('%s', '%s'))
                        $sql_extra2
-                       ORDER BY `frm` DESC, `name` ASC ",
+                       ORDER BY `name` ASC ",
                        intval(local_user()),
                        dbesc(NETWORK_OSTATUS), dbesc(NETWORK_STATUSNET)
                );
@@ -638,7 +638,9 @@ function acl_lookup(App $a, $out_type = 'json') {
                        }
                }
                if (count($forums) > 0) {
-                       $forums[] = array("separator" => true);
+                       if ($search == "") {
+                               $forums[] = array("separator" => true);
+                       }
                        $contacts = array_merge($forums, $contacts);
                }
        }