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

accounts_search with app param: for split_accounts we want the result merged all the time, as we use it for checking ids only

Browse Source
This commit is contained in:
Klaus Leithoff 2010-03-24 13:53:28 +00:00
parent 0dfb44228c
commit 3aec3b7e5a
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
phpgwapi/inc/class.accounts.inc.php
View File

@ -289,7 +289,8 @@ class accounts
$valid = array();
if ($app)
{
$valid = $this->split_accounts($app,$param['type'] == 'both' ? 'merge' : $param['type']);
// we want the result merged, whatever it takes, as we only care for the ids
$valid = $this->split_accounts($app,'merge');//$param['type'] == 'both' ? 'merge' : $param['type']);
}
if ($group)
{
@ -297,7 +298,7 @@ class accounts
if (!$members) $members = array();
$valid = !$app ? $members : array_intersect($valid,$members); // use the intersection
}
//echo "<p>limiting result to app='app' and/or group=$group valid-ids=".print_r($valid,true)."</p>\n";
//echo "<p>limiting result to app='$app' and/or group=$group valid-ids=".print_r($valid,true)."</p>\n";
$offset = $param['offset'] ? $param['offset'] : $GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs'];
$stop = $start + $offset;
$n = 0;