diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2018-05-22 16:31:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-22 16:31:30 +0200 |
| commit | 245d20f9ac8a5032bc11ff287f77d0e5a31bc3d5 (patch) | |
| tree | 6770f954bf64960f8ae35cd62165f5fb85481e3e /core/Controller | |
| parent | cbe5c193d0cbf1b294d2ebc7090f516e7a5cb5ce (diff) | |
| parent | 04e1cab5eed84081c0bf2381e745cc3d28330c2f (diff) | |
| download | nextcloud-server-245d20f9ac8a5032bc11ff287f77d0e5a31bc3d5.tar.gz nextcloud-server-245d20f9ac8a5032bc11ff287f77d0e5a31bc3d5.zip | |
Merge pull request #9531 from remyj38/master
Fix translation bug on lost password page
Diffstat (limited to 'core/Controller')
| -rw-r--r-- | core/Controller/LostController.php | 3 |
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()); } |