diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2018-05-22 22:58:53 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-22 22:58:53 +0300 |
| commit | 04ff701090f0b4226e1eef3e670b2693fcb956a5 (patch) | |
| tree | df57264ab9bcff7e7b7ffbf3b2cef51daf72315b /core | |
| parent | c628b613b9384458828b127f5c6304dab083f5de (diff) | |
| parent | 0b8908b8df0e9fdf5eb43e244295aab4869f9e92 (diff) | |
Merge pull request #9548 from remyj38/stable13
[stable13] Fix translation bug on lost password page
Diffstat (limited to 'core')
| -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 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()); } |