1 files changed, 7 insertions, 19 deletions

diff --git a/modules/gallery/controllers/file_proxy.php b/modules/gallery/controllers/file_proxy.php
index b17310c4..22854fbd 100644
--- a/modules/gallery/controllers/file_proxy.php
+++ b/modules/gallery/controllers/file_proxy.php
@@ -56,28 +56,16 @@ class File_Proxy_Controller extends Controller {
 
     // If the last element is .album.jpg, pop that off since it's not a real item
     $path = preg_replace("|/.album.jpg$|", "", $path);
-    $encoded_path = array();
-    foreach (explode("/", $path) as $path_part) {
-      $encoded_path[] = rawurlencode($path_part);
-    }
-    $encoded_path = implode("/", $encoded_path);
-    // We now have the relative path to the item.  Search for it in the path cache
-    // The patch cache is urlencoded so re-encode the path. (it was decoded earlier to
-    // insure that the paths are normalized.
-    $item = ORM::factory("item")
-      ->where("relative_path_cache", "=", $encoded_path)->find();
-    if (!$item->loaded()) {
-      // We didn't turn it up.  It's possible that the relative_path_cache is out of date here.
-      // There was fallback code, but bharat deleted it in 8f1bca74.  If it turns out to be
-      // necessary, it's easily resurrected.
 
-      // If we're looking for a .jpg then it's it's possible that we're requesting the thumbnail
-      // for a movie.  In that case, the .flv, .mp4 or .m4v file would have been converted to a
-      // .jpg. So try some alternate types:
+    $item = item::find_by_path($path);
+    if (!$item->loaded()) {
+      // We didn't turn it up. If we're looking for a .jpg then it's it's possible that we're
+      // requesting the thumbnail for a movie.  In that case, the .flv, .mp4 or .m4v file would
+      // have been converted to a .jpg. So try some alternate types:
       if (preg_match('/.jpg$/', $path)) {
         foreach (array("flv", "mp4", "m4v") as $ext) {
-          $movie_path = preg_replace('/.jpg$/', ".$ext", $encoded_path);
-          $item = ORM::factory("item")->where("relative_path_cache", "=", $movie_path)->find();
+          $movie_path = preg_replace('/.jpg$/', ".$ext", $path);
+          $item = item::find_by_path($movie_path);
           if ($item->loaded()) {
             break;
           }