1 files changed, 14 insertions, 15 deletions

diff --git a/modules/gallery/helpers/gallery_rest.php b/modules/gallery/helpers/gallery_rest.php
index 367c2684..dba109fd 100644
--- a/modules/gallery/helpers/gallery_rest.php
+++ b/modules/gallery/helpers/gallery_rest.php
@@ -18,41 +18,40 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 class gallery_rest_Core {
-  static function get_album($request) {
+  static function get($request) {
     if (empty($request->path)) {
       return rest::invalid_request();
     }
 
-    $album = ORM::factory("item")
+    $item = ORM::factory("item")
       ->where("relative_path_cache", $request->path)
-      ->where("type", "album")
       ->viewable()
       ->find();
 
-    if (!$album->loaded) {
-      return rest::not_found();
+    if (!$item->loaded) {
+      return rest::not_found("Resource: {$request->path} missing.");
     }
 
-    $response_data = array("path" => $album->relative_path(),
-                           "title" => $album->title,
-                           "thumb_url" => $album->thumb_url(),
-                           "url" => $album->abs_url(),
-                           "description" => $album->description,
-                           "internet_address" => $album->slug);
+    $response_data = array("path" => $item->relative_path(),
+                           "title" => $item->title,
+                           "thumb_url" => $item->thumb_url(),
+                           "url" => $item->abs_url(),
+                           "description" => $item->description,
+                           "internet_address" => $item->slug);
 
-    $children = self::_get_children($album, $request);
+    $children = self::_get_children($item, $request);
     if (!empty($children)) {
       $response_data["children"] = $children;
     }
-    return rest::success(array("album" => $response_data));
+    return rest::success(array($item->type => $response_data));
   }
 
-  private static function _get_children($album, $request) {
+  private static function _get_children($item, $request) {
     $children = array();
     $limit = empty($request->limit) ? null : $request->limit;
     $offset = empty($request->offset) ? null : $request->offset;
     $where = empty($request->filter) ? array() : array("type" => $request->filter);
-    foreach ($album->children($limit, $offset, $where) as $child) {
+    foreach ($item->viewable()->children($limit, $offset, $where) as $child) {
       $children[] = array("type" => $child->type,
                           "has_children" => $child->children_count() > 0,
                           "path" => $child->relative_path(),