diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2010-08-01 10:35:15 -0700 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2010-08-01 10:35:15 -0700 |
| commit | 3b187d7fe9acbe46e38ae824b6374dd3bfd0cfb0 (patch) | |
| tree | 81af4ec2993f740fb632c9f5ea4572bb2d1efa23 /modules/gallery/controllers/uploader.php | |
| parent | 563afbe6ddf4b4debea87a0cb0b8758c8826f80c (diff) | |
| parent | bf7115cf5a732cea2d498971ec94d2ade3b2fcdd (diff) | |
Merge branch 'dialog'
Diffstat (limited to 'modules/gallery/controllers/uploader.php')
| -rw-r--r-- | modules/gallery/controllers/uploader.php | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/modules/gallery/controllers/uploader.php b/modules/gallery/controllers/uploader.php index 38e22cee..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(); } - print json_encode(array("form" => (string)$this->_get_add_form($item))); - //print $this->_get_add_form($item); + print $this->_get_add_form($item); } public function start() { @@ -106,7 +105,7 @@ class Uploader_Controller extends Controller { access::verify_csrf(); batch::stop(); - print json_encode(array("result" => "success")); + json::reply(array("result" => "success")); } private function _get_add_form($album) { |