diff options
| author | Jörn Friedrich Dreyer <jfd@butonic.de> | 2014-12-11 16:23:39 +0100 |
|---|---|---|
| committer | Jörn Friedrich Dreyer <jfd@butonic.de> | 2015-01-02 10:28:41 +0100 |
| commit | 0e9b05b7012844e348d36b5b35e1c50487a3bbc4 (patch) | |
| tree | e910ca1483a8936327b0667eb2e28e75d10df3d4 /lib | |
| parent | c738359a111445aac90518db39b5d5883e44892d (diff) | |
| download | nextcloud-server-0e9b05b7012844e348d36b5b35e1c50487a3bbc4.tar.gz nextcloud-server-0e9b05b7012844e348d36b5b35e1c50487a3bbc4.zip | |
ajax paging, some js cleanups
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/search.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/private/search.php b/lib/private/search.php index 4629d52b40e..22f92534cbd 100644 --- a/lib/private/search.php +++ b/lib/private/search.php @@ -64,8 +64,10 @@ class Search implements ISearch { $providerResults = $provider->search($query); if ($size > 0) { $slicedResults = array_slice($providerResults, $page * $size, $size); + $results = array_merge($results, $slicedResults); + } else { + $results = array_merge($results, $providerResults); } - $results = array_merge($results, $slicedResults); } else { \OC::$server->getLogger()->warning('Ignoring Unknown search provider', array('provider' => $provider)); } |