summaryrefslogtreecommitdiff
path: root/modules/gallery/controllers/login.php
diff options
context:
space:
mode:
authorTim Almdal <tnalmdal@shaw.ca>2010-07-21 21:30:13 -0700
committerBharat Mediratta <bharat@menalto.com>2010-07-31 15:44:55 -0700
commit91a2c04a24c320df37ea980f11245eb4e086879e (patch)
tree2eea3bb8c750307b346d8112cdbfb0f44da6887d /modules/gallery/controllers/login.php
parent89d18c0714f5c982ef9e8711a04490bdac8cae2d (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/gallery/controllers/login.php')
-rw-r--r--modules/gallery/controllers/login.php7
1 files changed, 3 insertions, 4 deletions
diff --git a/modules/gallery/controllers/login.php b/modules/gallery/controllers/login.php
index b823504b..3454a245 100644
--- a/modules/gallery/controllers/login.php
+++ b/modules/gallery/controllers/login.php
@@ -22,7 +22,7 @@ class Login_Controller extends Controller {
public function ajax() {
$view = new View("login_ajax.html");
$view->form = auth::get_login_form("login/auth_ajax");
- print json_encode(array("form" => (string) $view));
+ json::reply(array("form" => (string) $view));
}
public function auth_ajax() {
@@ -30,10 +30,9 @@ class Login_Controller extends Controller {
list ($valid, $form) = $this->_auth("login/auth_ajax");
if ($valid) {
- print json_encode(
- array("result" => "success"));
+ json::reply(array("result" => "success"));
} else {
- print json_encode(array("result" => "error", "form" => (string) $form));
+ json::reply(array("result" => "error", "form" => (string) $form));
}
}