GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Fix whitescreen on recoverpassword with unknown user

This commit is contained in:
Michele macno Azzolari 2011-12-02 15:47:35 -05:00 committed by Evan Prodromou
parent 68676ad31d
commit ad2fd9abd4
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
actions/recoverpassword.php
View File

@ -288,10 +288,11 @@ class RecoverpasswordAction extends Action
'have been sent to the email address registered to your ' .
'account.');
$this->success = true;
$this->showPage();
} catch (Exception $e) {
$this->success = false;
$this->msg = $e->getMessage();
}
$this->showPage();
}
function resetPassword()

2
classes/User.php
View File

@ -1086,7 +1086,7 @@ class User extends Managed_DataObject
if (!$user) {
// TRANS: Information on password recovery form if no known username or e-mail address was specified.
throw new ClientError(_('No user with that email address or username.'));
throw new ClientException(_('No user with that email address or username.'));
return;
}