diff options
author | Tim Almdal <tnalmdal@shaw.ca> | 2010-07-21 21:30:13 -0700 |
---|---|---|
committer | Bharat Mediratta <bharat@menalto.com> | 2010-07-31 15:44:55 -0700 |
commit | 91a2c04a24c320df37ea980f11245eb4e086879e (patch) | |
tree | 2eea3bb8c750307b346d8112cdbfb0f44da6887d /modules/gallery/controllers/movies.php | |
parent | 89d18c0714f5c982ef9e8711a04490bdac8cae2d (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/movies.php')
-rw-r--r-- | modules/gallery/controllers/movies.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/modules/gallery/controllers/movies.php b/modules/gallery/controllers/movies.php index c18dbcde..fe6669e6 100644 --- a/modules/gallery/controllers/movies.php +++ b/modules/gallery/controllers/movies.php @@ -87,13 +87,13 @@ class Movies_Controller extends Items_Controller { if ($form->from_id->value == $movie->id) { // Use the new url; it might have changed. - print json_encode(array("result" => "success", "location" => $movie->url())); + json::reply(array("result" => "success", "location" => $movie->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 Movies_Controller extends Items_Controller { access::required("view", $movie); access::required("edit", $movie); - print json_encode(array("form" => (string) movie::get_edit_form($movie))); + json::reply(array("form" => (string) movie::get_edit_form($movie))); } } |