Merge branch 'master' into jquery_190

1 files changed, 9 insertions, 2 deletions

diff --git a/modules/search/controllers/search.php b/modules/search/controllers/search.php
index 673a281f..753d9b69 100644
--- a/modules/search/controllers/search.php
+++ b/modules/search/controllers/search.php
@@ -110,7 +110,14 @@ class Search_Controller extends Controller {
                    Breadcrumb::instance($item->title, $item->url())->set_last()));
   }
 
-  static function get_siblings($q, $album) {
-    return search::search_within_album(search::add_query_terms($q), $album, 1000, 1)[1];
+  static function get_siblings($q, $album, $limit, $offset) {
+    if (!isset($limit)) {
+      $limit = 100;
+    }
+    if (!isset($offset)) {
+      $offset = 1;
+    }
+    $result = search::search_within_album(search::add_query_terms($q), $album, $limit, $offset);
+    return $result[1];
   }
 }