diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2013-02-05 13:02:26 -0500 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2013-02-05 13:02:26 -0500 |
| commit | c4b2f79a677e38a9af87827ad2e753275eb37f6b (patch) | |
| tree | 1c48a294f9f47424e17d6640c0059e6c20ac0889 /modules | |
| parent | 3439eb57006f6973bbcd17c9d2c13b1edf909f52 (diff) | |
Force a sort order no sibling checks. Fixes #1990.
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/search/helpers/search.php | 10 |
1 files changed, 7 insertions, 3 deletions
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()) { |