2 files changed, 16 insertions, 5 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];
   }
 }
diff --git a/modules/search/helpers/search.php b/modules/search/helpers/search.php
index b1bde359..b21e59dd 100644
--- a/modules/search/helpers/search.php
+++ b/modules/search/helpers/search.php
@@ -132,11 +132,12 @@ class search_Core {
 
   static function get_position_within_album($item, $q, $album) {
     $page_size = module::get_var("gallery", "page_size", 9);
-    $query = self::_build_query_base($q, $album, array("{items}.id = " . $item->id));
+    $query = self::_build_query_base($q, $album, array("{items}.id = " . $item->id)) .
+      "ORDER BY `score` DESC ";
     $db = Database::instance();
 
     // Truncate the score by two decimal places as this resolves the issues
-    // that arise due to in exact numeric conversions.
+    // that arise due to inexact numeric conversions.
     $current = $db->query($query)->current();
     if (!$current) {
       // We can't find this result in our result set - perhaps we've fallen out of context?  Clear
@@ -149,7 +150,10 @@ class search_Core {
       $score = substr($score, 0, strlen($score) - 2);
     }
 
-    $data = $db->query(self::_build_query_base($q, $album) . " HAVING `score` >= " . $score);
+    // Redo the query but only look for results greater than or equal to our current location
+    // then seek backwards until we find our item.
+    $data = $db->query(self::_build_query_base($q, $album) . " HAVING `score` >= " . $score .
+                       "ORDER BY `score` DESC ");
     $data->seek($data->count() - 1);
 
     while ($data->get("id") != $item->id && $data->prev()->valid()) {