wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix share getItems() limit

Browse source
This commit is contained in:
Michael Gapczynski 2012-08-26 21:34:22 -04:00
parent c33a2ca01d
commit 18517f6adb
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lib/public/share.php
View file

@ -516,6 +516,14 @@ class Share {
// If the limit is not 1, the filtering can be done later // If the limit is not 1, the filtering can be done later
$where .= ' ORDER BY `*PREFIX*share`.`id` DESC'; $where .= ' ORDER BY `*PREFIX*share`.`id` DESC';
} }
// The limit must be at least 3, because filtering needs to be done
if ($limit < 3) {
$queryLimit = 3;
} else {
$queryLimit = $limit;
}
} else {
$queryLimit = null;
} }
// TODO Optimize selects // TODO Optimize selects
if ($format == self::FORMAT_STATUSES) { if ($format == self::FORMAT_STATUSES) {
@ -544,8 +552,7 @@ class Share {
} }
} }
$root = strlen($root); $root = strlen($root);
// The limit must be at least 3, because filtering needs to be done $query = \OC_DB::prepare('SELECT '.$select.' FROM `*PREFIX*share` '.$where, $queryLimit);
$query = \OC_DB::prepare('SELECT '.$select.' FROM `*PREFIX*share` '.$where, ($limit < 3 ? 3 : $limit));
$result = $query->execute($queryArgs); $result = $query->execute($queryArgs);
$items = array(); $items = array();
$targets = array(); $targets = array();