diff options
| author | mamouneyya <mamoun.diraneyya@gmail.com> | 2010-08-02 05:45:48 +0300 |
|---|---|---|
| committer | mamouneyya <mamoun.diraneyya@gmail.com> | 2010-08-02 05:45:48 +0300 |
| commit | 0a128bab0a788288c5291491a68bd1c9ab432825 (patch) | |
| tree | 29e9887258865343dc1a6e6322a3933cf6527c61 /modules/gallery/controllers/login.php | |
| parent | 8e1ae7549362688dd38e053dd736ddc5fc6a4982 (diff) | |
| parent | 9369fd55a36183b7dc1e4b42af46a8f649a66578 (diff) | |
Merge remote branch 'gallery3/master'
Diffstat (limited to 'modules/gallery/controllers/login.php')
| -rw-r--r-- | modules/gallery/controllers/login.php | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/modules/gallery/controllers/login.php b/modules/gallery/controllers/login.php index 2b60316b..62d33345 100644 --- a/modules/gallery/controllers/login.php +++ b/modules/gallery/controllers/login.php @@ -30,10 +30,11 @@ 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)); + $view = new View("login_ajax.html"); + $view->form = $form; + json::reply(array("result" => "error", "html" => (string)$view)); } } |