Merge remote branch 'gallery3/master'

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() {