mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-28 09:38:53 +01:00
fixed error in caching of sub-queries
This commit is contained in:
parent
13bcfd8318
commit
c4326776b2
@ -119,7 +119,7 @@
|
|||||||
'firstname' => 'firstname',
|
'firstname' => 'firstname',
|
||||||
'lastname' => 'lastname',
|
'lastname' => 'lastname',
|
||||||
'lid' => 'LoginID',
|
'lid' => 'LoginID',
|
||||||
'email' => 'email', // sql-constructor unsets this again, til the email column is added
|
'email' => 'email',
|
||||||
'start' => 'start with',
|
'start' => 'start with',
|
||||||
'exact' => 'exact',
|
'exact' => 'exact',
|
||||||
);
|
);
|
||||||
@ -247,6 +247,10 @@
|
|||||||
}
|
}
|
||||||
$account_search[$serial2]['total'] = $this->total;
|
$account_search[$serial2]['total'] = $this->total;
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
$this->total = $account_search[$serial2]['total'];
|
||||||
|
}
|
||||||
if ($app || $group) // limit the search on accounts with run-rights for app or a group
|
if ($app || $group) // limit the search on accounts with run-rights for app or a group
|
||||||
{
|
{
|
||||||
$valid = array();
|
$valid = array();
|
||||||
@ -269,6 +273,7 @@
|
|||||||
if (!$members) $members = array();
|
if (!$members) $members = array();
|
||||||
$valid = !$app ? $members : array_intersect($valid,$members); // use the intersection
|
$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";
|
||||||
$offset = $param['offset'] ? $param['offset'] : $GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
|
$offset = $param['offset'] ? $param['offset'] : $GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
|
||||||
$stop = $start + $offset;
|
$stop = $start + $offset;
|
||||||
$n = 0;
|
$n = 0;
|
||||||
|
Loading…
Reference in New Issue
Block a user