add proper Exception message for invalid token

12 years ago · dda5e6c85b
parent 1cb7239cb7
commit dda5e6c85b
1 changed files with 5 additions and 2 deletions
--- a/core/lostpassword/controller/lostcontroller.php
+++ b/core/lostpassword/controller/lostcontroller.php
@ -106,8 +106,11 @@ class LostController extends Controller {
 		try {
 			$user = $this->userManager->get($userId);

-			if (!$this->checkToken($userId, $token) ||
-				!$user->setPassword($userId, $password)) {
+			if (!$this->checkToken($userId, $token)) {
+				throw new \Exception($this->l10n->t('Couldn\'t reset password because the token is invalid'));
+			}
+
+			if (!$user->setPassword($userId, $password)) {
 				throw new \Exception();
 			}