summaryrefslogtreecommitdiff
path: root/modules/gallery/controllers/photos.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/photos.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/photos.php')
-rw-r--r--modules/gallery/controllers/photos.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/modules/gallery/controllers/photos.php b/modules/gallery/controllers/photos.php
index 9f17cebb..7c834e64 100644
--- a/modules/gallery/controllers/photos.php
+++ b/modules/gallery/controllers/photos.php
@@ -87,13 +87,13 @@ class Photos_Controller extends Items_Controller {
if ($form->from_id->value == $photo->id) {
// Use the new url; it might have changed.
- print json_encode(array("result" => "success", "location" => $photo->url()));
+ json::reply(array("result" => "success", "location" => $photo->url()));
} else {
// Stay on the same page
- print json_encode(array("result" => "success"));
+ json::reply(array("result" => "success"));
}
} else {
- print json_encode(array("result" => "error", "form" => (string) $form));
+ json::reply(array("result" => "error", "form" => (string) $form));
}
}
@@ -102,6 +102,6 @@ class Photos_Controller extends Items_Controller {
access::required("view", $photo);
access::required("edit", $photo);
- print json_encode(array("form" => (string) photo::get_edit_form($photo)));
+ json::reply(array("form" => (string) photo::get_edit_form($photo)));
}
}