Merge pull request #9531 from remyj38/master
Fix translation bug on lost password page
This commit is contained in:
commit
245d20f9ac
|
@ -31,6 +31,7 @@
|
||||||
|
|
||||||
namespace OC\Core\Controller;
|
namespace OC\Core\Controller;
|
||||||
|
|
||||||
|
use OC\HintException;
|
||||||
use \OCP\AppFramework\Controller;
|
use \OCP\AppFramework\Controller;
|
||||||
use OCP\AppFramework\Http\JSONResponse;
|
use OCP\AppFramework\Http\JSONResponse;
|
||||||
use \OCP\AppFramework\Http\TemplateResponse;
|
use \OCP\AppFramework\Http\TemplateResponse;
|
||||||
|
@ -275,6 +276,8 @@ class LostController extends Controller {
|
||||||
|
|
||||||
$this->config->deleteUserValue($userId, 'core', 'lostpassword');
|
$this->config->deleteUserValue($userId, 'core', 'lostpassword');
|
||||||
@\OC::$server->getUserSession()->unsetMagicInCookie();
|
@\OC::$server->getUserSession()->unsetMagicInCookie();
|
||||||
|
} catch (HintException $e){
|
||||||
|
return $this->error($e->getHint());
|
||||||
} catch (\Exception $e){
|
} catch (\Exception $e){
|
||||||
return $this->error($e->getMessage());
|
return $this->error($e->getMessage());
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue