Merge pull request #3604 from annando/bugfix-acl
Bugfix: The ACL lookup had its problems after the last changes
This commit is contained in:
commit
8cb4a8d0c4
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user