Use the relative url cache to look up resources instead of the relative path. This allows us to forego the extension as part of the REST url. As well, urls are consistent between normal usage and rest usage.

1 files changed, 3 insertions, 3 deletions

diff --git a/modules/gallery/helpers/gallery_rest.php b/modules/gallery/helpers/gallery_rest.php
index dba109fd..043e17b5 100644
--- a/modules/gallery/helpers/gallery_rest.php
+++ b/modules/gallery/helpers/gallery_rest.php
@@ -24,7 +24,7 @@ class gallery_rest_Core {
     }
 
     $item = ORM::factory("item")
-      ->where("relative_path_cache", $request->path)
+      ->where("relative_url_cache", $request->path)
       ->viewable()
       ->find();
 
@@ -32,7 +32,7 @@ class gallery_rest_Core {
       return rest::not_found("Resource: {$request->path} missing.");
     }
 
-    $response_data = array("path" => $item->relative_path(),
+    $response_data = array("path" => $item->relative_url(),
                            "title" => $item->title,
                            "thumb_url" => $item->thumb_url(),
                            "url" => $item->abs_url(),
@@ -54,7 +54,7 @@ class gallery_rest_Core {
     foreach ($item->viewable()->children($limit, $offset, $where) as $child) {
       $children[] = array("type" => $child->type,
                           "has_children" => $child->children_count() > 0,
-                          "path" => $child->relative_path(),
+                          "path" => $child->relative_url(),
                           "title" => $child->title);
     }