summaryrefslogtreecommitdiffstats
path: root/core/Controller/LostController.php
diff options
context:
space:
mode:
authorRémy Jacquin <remy@remyj.fr>2018-05-20 12:51:50 +0200
committerRémy Jacquin <remy@remyj.fr>2018-05-20 12:51:50 +0200
commit04e1cab5eed84081c0bf2381e745cc3d28330c2f (patch)
tree5966598b00b8c9d533d7cb0520418b9ceb65b667 /core/Controller/LostController.php
parentca089b9412af79cc696342968a657991755a2e2e (diff)
downloadnextcloud-server-04e1cab5eed84081c0bf2381e745cc3d28330c2f.tar.gz
nextcloud-server-04e1cab5eed84081c0bf2381e745cc3d28330c2f.zip
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/Controller/LostController.php')
-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 90a1176ae83..f45de3653ea 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());
}