From: Michael <heluecht@pirati.ca>
Date: Thu, 27 Jul 2017 14:02:25 +0000 (+0000)
Subject: Bugfix: The ACL lookup had its problems after the last changes
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=57b4ea4759e8145e24540e6ec4f70bdc6129fa92;p=friendica.git

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

diff --git a/include/acl_selectors.php b/include/acl_selectors.php
index ca463d9433..8205854ba6 100644
--- 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);
 		}
 	}