mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #9549 from remyj38/stable12 

[stable12] Fix translation bug on lost password page
This commit is contained in:
Morris Jobke 2018-05-22 21:58:27 +02:00 committed by GitHub
parent dc585de355 4130f279b2
commit 2c64557629
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/Controller/LostController.php
View File

@ -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());
}