summaryrefslogtreecommitdiff
path: root/modules/user
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/user
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/user')
-rw-r--r--modules/user/controllers/password.php8
1 files changed, 3 insertions, 5 deletions
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() {