Fix share getItems() limit

diff --git a/lib/public/share.php b/lib/public/share.php
index 070d69d05ae1bbac9da7829d73dbe3ad7f21f5ad..9ee7ef0516baafd5f3e6b6357c254189e602186f 100644 (file)
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -516,6 +516,14 @@ class Share {
                                // If the limit is not 1, the filtering can be done later
                                $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
                if ($format == self::FORMAT_STATUSES) {
@@ -544,8 +552,7 @@ class Share {
                        }
                }
                $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, ($limit < 3 ? 3 : $limit));
+               $query = \OC_DB::prepare('SELECT '.$select.' FROM `*PREFIX*share` '.$where, $queryLimit);
                $result = $query->execute($queryArgs);
                $items = array();
                $targets = array();