diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2010-07-13 12:30:03 -0700 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2010-07-13 12:30:03 -0700 |
| commit | 887154a3b797eade36c1c651e2e849c613459544 (patch) | |
| tree | 835214c5c76dbfa2b1de584a6f3f58235a0009ad /modules/gallery/controllers/flash_uploader.php | |
| parent | 5eb4b8ff6cae33d83cfef8ea3d41cba4352e65d8 (diff) | |
| parent | 69dfb51490b62bd639c8e09461fad15f4fb51650 (diff) | |
Merge branch 'master' of github.com:gallery/gallery3
Diffstat (limited to 'modules/gallery/controllers/flash_uploader.php')
| -rw-r--r-- | modules/gallery/controllers/flash_uploader.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/modules/gallery/controllers/flash_uploader.php b/modules/gallery/controllers/flash_uploader.php index bc8b964f..6bfdd851 100644 --- a/modules/gallery/controllers/flash_uploader.php +++ b/modules/gallery/controllers/flash_uploader.php @@ -26,7 +26,8 @@ class Flash_Uploader_Controller extends Controller { $item = $item->parent(); } - print $this->_get_add_form($item); + print json_encode(array("form" => (string)$this->_get_add_form($item))); + //print $this->_get_add_form($item); } public function start() { |