From 48c2e73048be15c7d575293e0e5c69b93ab92398 Mon Sep 17 00:00:00 2001 From: Tim Almdal Date: Wed, 21 Jul 2010 21:30:13 -0700 Subject: 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 --- modules/user/controllers/password.php | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'modules/user') diff --git a/modules/user/controllers/password.php b/modules/user/controllers/password.php index 522b6b35..4058ef50 100644 --- a/modules/user/controllers/password.php +++ b/modules/user/controllers/password.php @@ -27,11 +27,10 @@ class Password_Controller extends Controller { if ($form->validate()) { $this->_send_reset($form); } else { - print json_encode(array("result" => "error", - "form" => (string) $form)); + json::reply(array("result" => "error", "form" => (string) $form)); } } else { - print $form; + json::reply(array("form" => (string) $form)); } } @@ -83,8 +82,7 @@ class Password_Controller extends Controller { // Always pretend that an email has been sent to avoid leaking // information on what user names are actually real. message::success(t("Password reset email sent")); - print json_encode( - array("result" => "success")); + json::reply(array("result" => "success")); } private static function _reset_form() { -- cgit v1.2.3