diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2010-08-01 08:31:09 -0700 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2010-08-01 08:31:09 -0700 |
| commit | a4531707274318496bb7a4477d940030d870f133 (patch) | |
| tree | 6715be3db83d7f834676a0b2c7a38c9bd58ce1a5 /modules/gallery/controllers/uploader.php | |
| parent | fc580037e797fad48b49fcffa7aa69dca8761972 (diff) | |
| parent | 7607e1f932dda53144792d0b7e8674a34fbc7f9a (diff) | |
Merge branch 'dialog' of github.com:gallery/gallery3 into dialog
Diffstat (limited to 'modules/gallery/controllers/uploader.php')
| -rw-r--r-- | modules/gallery/controllers/uploader.php | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/modules/gallery/controllers/uploader.php b/modules/gallery/controllers/uploader.php index c686c787..87520032 100644 --- a/modules/gallery/controllers/uploader.php +++ b/modules/gallery/controllers/uploader.php @@ -26,8 +26,7 @@ class Uploader_Controller extends Controller { $item = $item->parent(); } - json::reply(array("form" => (string)$this->_get_add_form($item))); - //print $this->_get_add_form($item); + print $this->_get_add_form($item); } public function start() { |