From 2d5c232c42ea52e0c1115dd93edafecf1978fbfe Mon Sep 17 00:00:00 2001 From: Tim Almdal Date: Wed, 25 Nov 2009 12:41:01 -0800 Subject: Refactor the album, movie and photo handling to remove the REST_Controller. Partial fix for ticket #917 --- modules/gallery/controllers/photos.php | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) (limited to 'modules/gallery/controllers/photos.php') diff --git a/modules/gallery/controllers/photos.php b/modules/gallery/controllers/photos.php index 0c2ff6ee..f052eccd 100644 --- a/modules/gallery/controllers/photos.php +++ b/modules/gallery/controllers/photos.php @@ -18,10 +18,6 @@ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ class Photos_Controller extends Items_Controller { - - /** - * @see REST_Controller::_show($resource) - */ public function _show($photo) { access::required("view", $photo); @@ -53,12 +49,9 @@ class Photos_Controller extends Items_Controller { print $template; } - - /** - * @see REST_Controller::_update($resource) - */ - public function _update($photo) { + public function update($photo_id) { access::verify_csrf(); + $photo = ORM::factory("item", $photo_id); access::required("view", $photo); access::required("edit", $photo); @@ -125,10 +118,8 @@ class Photos_Controller extends Items_Controller { } } - /** - * @see REST_Controller::_form_edit($resource) - */ - public function _form_edit($photo) { + public function form_edit($photo_id) { + $photo = ORM::factory("item", $photo_id); access::required("view", $photo); access::required("edit", $photo); -- cgit v1.2.3