diff options
| -rw-r--r-- | modules/gallery/helpers/item.php | 7 | ||||
| -rw-r--r-- | modules/search/helpers/search.php | 9 |
2 files changed, 15 insertions, 1 deletions
diff --git a/modules/gallery/helpers/item.php b/modules/gallery/helpers/item.php index d8b660d9..b739e8bd 100644 --- a/modules/gallery/helpers/item.php +++ b/modules/gallery/helpers/item.php @@ -415,6 +415,13 @@ class item_Core { } /** + * Get rid of the display context callback + */ + static function clear_display_context_callback() { + Cache::instance()->delete("display_context_" . $sid = Session::instance()->id()); + } + + /** * Call the display context callback for the given item */ static function get_display_context($item) { diff --git a/modules/search/helpers/search.php b/modules/search/helpers/search.php index b7fa21c4..64a13825 100644 --- a/modules/search/helpers/search.php +++ b/modules/search/helpers/search.php @@ -117,7 +117,14 @@ class search_Core { // Truncate the score by two decimal places as this resolves the issues // that arise due to in exact numeric conversions. - $score = $db->query($query)->current()->score; + $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 + // the context and try again. + item::clear_display_context_callback(); + url::redirect(url::current()); + } + $score = $current->score(); if (strlen($score) > 7) { $score = substr($score, 0, strlen($score) - 2); } |