summaryrefslogtreecommitdiff
path: root/modules/user/controllers/password.php
diff options
context:
space:
mode:
authorBharat Mediratta <bharat@menalto.com>2010-08-01 10:35:15 -0700
committerBharat Mediratta <bharat@menalto.com>2010-08-01 10:35:15 -0700
commit3b187d7fe9acbe46e38ae824b6374dd3bfd0cfb0 (patch)
tree81af4ec2993f740fb632c9f5ea4572bb2d1efa23 /modules/user/controllers/password.php
parent563afbe6ddf4b4debea87a0cb0b8758c8826f80c (diff)
parentbf7115cf5a732cea2d498971ec94d2ade3b2fcdd (diff)
Merge branch 'dialog'
Diffstat (limited to 'modules/user/controllers/password.php')
-rw-r--r--modules/user/controllers/password.php6
1 files changed, 2 insertions, 4 deletions
diff --git a/modules/user/controllers/password.php b/modules/user/controllers/password.php
index 522b6b35..575720a8 100644
--- a/modules/user/controllers/password.php
+++ b/modules/user/controllers/password.php
@@ -27,8 +27,7 @@ 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", "html" => (string)$form));
}
} else {
print $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() {