stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-05-20 03:19:13 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

More patches as part of #1225. Change the 'core' modules to use the json::reply

Browse Source 
method to set the content type header and encode the response as a json object
This commit is contained in:
Tim Almdal
2010-07-21 21:30:13 -07:00
committed by Bharat Mediratta
parent 89d18c0714
commit 91a2c04a24
27 changed files with 84 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/user/controllers/password.php
View File

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