holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adjust 'Group' account search keyword so even if someone searches for 'Group', we still respect the 'type' parameter and only return user accounts if that was what was requested.

Browse Source
This commit is contained in:
nathangray 2017-09-20 09:27:39 -06:00
parent a6139594ed
commit 9520863a91
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/src/Accounts.php
View File

@ -199,7 +199,9 @@ class Accounts
// Check for lang(Group) in search - if there, we search all groups
$group_index = array_search(strtolower(lang('Group')), array_map('strtolower', $query = explode(' ',$param['query'])));
if($group_index !== FALSE)
if($group_index !== FALSE && !(
in_array($param['type'], array('accounts', 'groupmembers')) || is_int($param['type'])
))
{
// do not return any groups for account-selection == "none"
if ($GLOBALS['egw_info']['user']['preferences']['common']['account_selection'] === 'none' &&