upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-11 09:42:09 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 40

Merge pull request #9549 from remyj38/stable12

Browse source 
[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
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());
}