Merge branch 'master' of git://github.com/gallery/gallery3

1 files changed, 8 insertions, 4 deletions

diff --git a/modules/search/helpers/search.php b/modules/search/helpers/search.php
index 32b36e73..b21e59dd 100644
--- a/modules/search/helpers/search.php
+++ b/modules/search/helpers/search.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2012 Bharat Mediratta
+ * Copyright (C) 2000-2013 Bharat Mediratta
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -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()) {