From 893364a28955358ad259bfb75798560616ab3d49 Mon Sep 17 00:00:00 2001
From: Cash Costello <cash.costello@gmail.com>
Date: Mon, 25 Oct 2010 00:22:20 +0000
Subject: supporting both basic and flash uploader

---
 views/default/tidypics/forms/upload.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'views/default/tidypics/forms/upload.php')

diff --git a/views/default/tidypics/forms/upload.php b/views/default/tidypics/forms/upload.php
index 691d9701b..5a9703171 100644
--- a/views/default/tidypics/forms/upload.php
+++ b/views/default/tidypics/forms/upload.php
@@ -3,8 +3,7 @@ global $CONFIG;
 
 //this is for image uploads only. Image edits are handled by edit.php form
 
-$container_guid = get_input('container_guid');
-$album = get_entity($vars['album']);
+$album = $vars['album'];
 $access_id = $album->access_id;
 
 $maxfilesize = (float) get_plugin_setting('maxfilesize','tidypics');
@@ -59,8 +58,8 @@ if ($quota) {
 </p>
 <p>
 	<?php
-	if ($container_guid) {
-		echo '<input type="hidden" name="container_guid" value="' . $container_guid . '" />';
+	if ($album) {
+		echo '<input type="hidden" name="album_guid" value="' . $album->guid . '" />';
 	}
 	if ($access_id) {
 		echo '<input type="hidden" name="access_id" value="' . $access_id . '" />';
-- 
cgit v1.2.3