From dda5e6c85bb40bd38ce2d323bf30a9e8cd18d4cf Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Fri, 13 Jun 2014 16:18:58 +0200
Subject: [PATCH] add proper Exception message for invalid token
---
core/lostpassword/controller/lostcontroller.php | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/core/lostpassword/controller/lostcontroller.php b/core/lostpassword/controller/lostcontroller.php
index 021233235f0..b1be65b4f01 100644
--- 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();
}
--
GitLab