Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorRémy Jacquin <remy@remyj.fr>2018-05-20 13:51:50 +0300
committerRémy Jacquin <remy@remyj.fr>2018-05-22 19:43:27 +0300
commit0b8908b8df0e9fdf5eb43e244295aab4869f9e92 (patch)
tree76e2f1c812f9da28a0ab002ad0e439f5ab0a80d2 /core
parent352d0af868a715cd1080bc01d16aad1397444e8c (diff)
Fix translation bug on lost password page
Fix nextcloud/password_policy#26 Signed-off-by: Rémy Jacquin <remy@remyj.fr>
Diffstat (limited to 'core')
-rw-r--r--core/Controller/LostController.php3
1 files changed, 3 insertions, 0 deletions
diff --git a/core/Controller/LostController.php b/core/Controller/LostController.php
index e7462180388..5350dca0af6 100644
--- a/core/Controller/LostController.php
+++ b/core/Controller/LostController.php
@@ -31,6 +31,7 @@
namespace OC\Core\Controller;
+use OC\HintException;
use \OCP\AppFramework\Controller;
use OCP\AppFramework\Http\JSONResponse;
use \OCP\AppFramework\Http\TemplateResponse;
@@ -275,6 +276,8 @@ class LostController extends Controller {
$this->config->deleteUserValue($userId, 'core', 'lostpassword');
@\OC::$server->getUserSession()->unsetMagicInCookie();
+ } catch (HintException $e){
+ return $this->error($e->getHint());
} catch (\Exception $e){
return $this->error($e->getMessage());
}