If the argument to app() is not an album id, switch to the item parent.

Fixes ticket #489.

1 files changed, 3 insertions, 0 deletions

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;