diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2010-08-01 08:31:09 -0700 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2010-08-01 08:31:09 -0700 |
| commit | a4531707274318496bb7a4477d940030d870f133 (patch) | |
| tree | 6715be3db83d7f834676a0b2c7a38c9bd58ce1a5 /modules/user/controllers/password.php | |
| parent | fc580037e797fad48b49fcffa7aa69dca8761972 (diff) | |
| parent | 7607e1f932dda53144792d0b7e8674a34fbc7f9a (diff) | |
Merge branch 'dialog' of github.com:gallery/gallery3 into dialog
Diffstat (limited to 'modules/user/controllers/password.php')
| -rw-r--r-- | modules/user/controllers/password.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/user/controllers/password.php b/modules/user/controllers/password.php index 4058ef50..575720a8 100644 --- a/modules/user/controllers/password.php +++ b/modules/user/controllers/password.php @@ -27,10 +27,10 @@ class Password_Controller extends Controller { if ($form->validate()) { $this->_send_reset($form); } else { - json::reply(array("result" => "error", "form" => (string) $form)); + json::reply(array("result" => "error", "html" => (string)$form)); } } else { - json::reply(array("form" => (string) $form)); + print $form; } } |