From 4e95ec843a2bef45e044e2aa3a36fcb590d85464 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 8 Aug 2010 01:12:43 -0700
Subject: Allow item_rest::put() to replace the current data file.  Remove
 data_rest::put() altogether; it's no longer necessary.

---
 modules/gallery/helpers/data_rest.php | 12 ------------
 modules/gallery/helpers/item_rest.php |  6 ++++++
 2 files changed, 6 insertions(+), 12 deletions(-)

(limited to 'modules')

diff --git a/modules/gallery/helpers/data_rest.php b/modules/gallery/helpers/data_rest.php
index ca5acb4a..e45a4645 100644
--- a/modules/gallery/helpers/data_rest.php
+++ b/modules/gallery/helpers/data_rest.php
@@ -58,18 +58,6 @@ class data_rest_Core {
     return $result;
   }
 
-  static function put($request) {
-    $item = rest::resolve($request->url);
-    access::required("edit", $item);
-
-    if ($item->is_album()) {
-      throw new Rest_Exception("Bad Request", 400, array("errors" => array("type" => "invalid")));
-    }
-
-    $item->set_data_file($request->file);
-    $item->save();
-  }
-
   static function resolve($id) {
     $item = ORM::factory("item", $id);
     if (!access::can("view", $item)) {
diff --git a/modules/gallery/helpers/item_rest.php b/modules/gallery/helpers/item_rest.php
index 6869181d..10f9e16a 100644
--- a/modules/gallery/helpers/item_rest.php
+++ b/modules/gallery/helpers/item_rest.php
@@ -126,6 +126,12 @@ class item_rest_Core {
         }
       }
     }
+
+    // Replace the data file, if required
+    if (($item->is_photo() || $item->is_movie()) && isset($request->file)) {
+      $item->set_data_file($request->file);
+    }
+
     $item->save();
 
     if (isset($request->params->members) && $item->sort_column == "weight") {
-- 
cgit v1.2.3