Merge pull request #9549 from remyj38/stable12
[stable12] Fix translation bug on lost password page
This commit is contained in:
commit
2c64557629
|
@ -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());
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue