From a79d20a36135d50f77a7f11046b1d7ee392d46c7 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 30 Jan 2010 23:36:41 -0800
Subject: Use Item_Model::as_restful_array() to simplify tests.

---
 modules/gallery/helpers/item_rest.php | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

(limited to 'modules/gallery/helpers')

diff --git a/modules/gallery/helpers/item_rest.php b/modules/gallery/helpers/item_rest.php
index f5056bc1..c0fc422a 100644
--- a/modules/gallery/helpers/item_rest.php
+++ b/modules/gallery/helpers/item_rest.php
@@ -75,20 +75,9 @@ class item_rest_Core {
       $members[] = rest::url("item", $child);
     }
 
-    // Convert item ids to rest URLs for consistency
-    $entity = $item->as_array();
-    if ($tmp = $item->parent()) {
-      $entity["parent"] = rest::url("item", $tmp);
-    }
-    unset($entity["parent_id"]);
-    if ($tmp = $item->album_cover()) {
-      $entity["album_cover"] = rest::url("item", $tmp);
-    }
-    unset($entity["album_cover_id"]);
-
     return array(
       "url" => $request->url,
-      "entity" => $entity,
+      "entity" => $item->as_restful_array(),
       "members" => $members,
       "relationships" => rest::relationships("item", $item));
   }
-- 
cgit v1.2.3