Merge pull request #9548 from remyj38/stable13

[stable13] Fix translation bug on lost password page
nextcloud · May 22, 2018 · 04ff701 · 04ff701
2 parents c628b61 + 0b8908b
commit 04ff701
Showing 1 changed file with 3 additions and 0 deletions.
diff --git 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 @@ public function setPassword($token, $userId, $password, $proceed) {
 
 			$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());
 		}