summaryrefslogtreecommitdiffstats
path: root/core/Controller
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-22 18:47:16 +0200
commit4130f279b20864eb3f5fcf7b6547615d8d66101c (patch)
tree6be43f546240b68925c906e02a447f21f2c38b7b /core/Controller
parent5a9e54ad5925a2b7d5d224cfa9f285d10b587b27 (diff)
downloadnextcloud-server-4130f279b20864eb3f5fcf7b6547615d8d66101c.tar.gz
nextcloud-server-4130f279b20864eb3f5fcf7b6547615d8d66101c.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')
-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 86f9e7478e3..7f60be03b71 100644
--- a/core/Controller/LostController.php
+++ b/core/Controller/LostController.php
@@ -30,6 +30,7 @@
namespace OC\Core\Controller;
+use OC\HintException;
use \OCP\AppFramework\Controller;
use OCP\AppFramework\Http\JSONResponse;
use \OCP\AppFramework\Http\TemplateResponse;
@@ -274,6 +275,8 @@ class LostController extends Controller {
$this->config->deleteUserValue($userId, 'core', 'lostpassword');
@\OC_User::unsetMagicInCookie();
+ } catch (HintException $e){
+ return $this->error($e->getHint());
} catch (\Exception $e){
return $this->error($e->getMessage());
}