summaryrefslogtreecommitdiff
path: root/modules/gallery/controllers/uploader.php
diff options
context:
space:
mode:
authorTim Almdal <tnalmdal@shaw.ca>2010-07-21 21:30:13 -0700
committerBharat Mediratta <bharat@menalto.com>2010-07-31 15:44:55 -0700
commit91a2c04a24c320df37ea980f11245eb4e086879e (patch)
tree2eea3bb8c750307b346d8112cdbfb0f44da6887d /modules/gallery/controllers/uploader.php
parent89d18c0714f5c982ef9e8711a04490bdac8cae2d (diff)
More patches as part of #1225. Change the 'core' modules to use the json::reply
method to set the content type header and encode the response as a json object
Diffstat (limited to 'modules/gallery/controllers/uploader.php')
-rw-r--r--modules/gallery/controllers/uploader.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/gallery/controllers/uploader.php b/modules/gallery/controllers/uploader.php
index 38e22cee..c686c787 100644
--- a/modules/gallery/controllers/uploader.php
+++ b/modules/gallery/controllers/uploader.php
@@ -26,7 +26,7 @@ class Uploader_Controller extends Controller {
$item = $item->parent();
}
- print json_encode(array("form" => (string)$this->_get_add_form($item)));
+ json::reply(array("form" => (string)$this->_get_add_form($item)));
//print $this->_get_add_form($item);
}
@@ -106,7 +106,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) {