Merge branch 'master' of git://github.com/gallery/gallery3

1 files changed, 7 insertions, 6 deletions

diff --git a/modules/gallery/helpers/items_rest.php b/modules/gallery/helpers/items_rest.php
index 05ca65cf..5d8e80b2 100644
--- a/modules/gallery/helpers/items_rest.php
+++ b/modules/gallery/helpers/items_rest.php
@@ -22,19 +22,20 @@ class items_rest_Core {
 
     $items = array();
     if (isset($request->params->url)) {
-      foreach($request->params->url as $url) {
+      foreach (json_decode($request->params->url) as $url) {
         $item = rest::resolve($url);
         if (access::can("view", $item)) {
-          $members = array();
+          $item_rest = array("url" => $url,
+                             "entity" => $item->as_restful_array(),
+                             "relationship" => rest::relationships("item", $item));
           if ($item->type == "album") {
+            $members = array();
             foreach ($item->children() as $child) {
               $members[] = rest::url("item", $child);
             }
+            $item_rest["members"] = $members;
           }
-          $items[] = array("url" => $url,
-                           "entity" => $item->as_restful_array(),
-                           "members" => $members,
-                           "relationship" => rest::relationships("item", $item));
+          $items[] = $item_rest;
         }
       }
     }