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
committerTim Almdal <tnalmdal@shaw.ca>2010-07-23 23:05:39 -0700
commit48c2e73048be15c7d575293e0e5c69b93ab92398 (patch)
treede066a8cad94aa29bb51bcce1e562fed0f30081b /modules/gallery/controllers/uploader.php
parent2cb87631b769c55a7af2b308f0e8975c11369138 (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) {