summaryrefslogtreecommitdiff
path: root/modules/gallery/controllers/movies.php
diff options
context:
space:
mode:
authormamouneyya <mamoun.diraneyya@gmail.com>2010-08-02 05:45:48 +0300
committermamouneyya <mamoun.diraneyya@gmail.com>2010-08-02 05:45:48 +0300
commit0a128bab0a788288c5291491a68bd1c9ab432825 (patch)
tree29e9887258865343dc1a6e6322a3933cf6527c61 /modules/gallery/controllers/movies.php
parent8e1ae7549362688dd38e053dd736ddc5fc6a4982 (diff)
parent9369fd55a36183b7dc1e4b42af46a8f649a66578 (diff)
Merge remote branch 'gallery3/master'
Diffstat (limited to 'modules/gallery/controllers/movies.php')
-rw-r--r--modules/gallery/controllers/movies.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/gallery/controllers/movies.php b/modules/gallery/controllers/movies.php
index 16d22d90..02d2a497 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", "html" => (string) $form));
}
}