From df848618334259f09ebae271452a8b67374943bf Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Mon, 29 Jun 2009 20:23:23 -0700 Subject: If the argument to app() is not an album id, switch to the item parent. Fixes ticket #489. --- modules/gallery/controllers/simple_uploader.php | 3 +++ 1 file changed, 3 insertions(+) (limited to 'modules/gallery/controllers/simple_uploader.php') diff --git a/modules/gallery/controllers/simple_uploader.php b/modules/gallery/controllers/simple_uploader.php index e68df2b8..713e30af 100644 --- a/modules/gallery/controllers/simple_uploader.php +++ b/modules/gallery/controllers/simple_uploader.php @@ -22,6 +22,9 @@ class Simple_Uploader_Controller extends Controller { $item = ORM::factory("item", $id); access::required("view", $item); access::required("add", $item); + if (!$item->is_album()) { + $item = $item->parent(); + } $v = new View("simple_uploader.html"); $v->item = $item; -- cgit v1.2.3