summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorChristoph Wurst <christoph@owncloud.com>2016-04-28 11:59:26 +0200
committerThomas Müller <thomas.mueller@tmit.eu>2016-05-11 13:36:46 +0200
commitaa85edd2242c696954c64799e7880f7a3d39ca83 (patch)
tree06bfb0fd7b96b79da434794a033b0a900e2fd281 /core
parent8cc5f6036f6ff1377077da0eed1cf4350db4b7e6 (diff)
downloadnextcloud-server-aa85edd2242c696954c64799e7880f7a3d39ca83.tar.gz
nextcloud-server-aa85edd2242c696954c64799e7880f7a3d39ca83.zip
increase token column width
add some range to time() assertions
Diffstat (limited to 'core')
-rw-r--r--core/Controller/LoginController.php3
1 files changed, 1 insertions, 2 deletions
diff --git a/core/Controller/LoginController.php b/core/Controller/LoginController.php
index 63ea7babaf1..e9352b079f7 100644
--- a/core/Controller/LoginController.php
+++ b/core/Controller/LoginController.php
@@ -157,7 +157,6 @@ class LoginController extends Controller {
}
/**
- * @NoCSRFRequired
* @PublicPage
* @UseSession
*
@@ -177,7 +176,7 @@ class LoginController extends Controller {
}
}
if ($loginResult) {
- return new RedirectResponse($this->urlGenerator->linkToRoute('login#showLoginForm'));
+ return new RedirectResponse($this->urlGenerator->linkToRoute('core.login.showLoginForm'));
}
$this->userSession->createSessionToken($this->request, $user, $password);
if (!is_null($redirect_url) && $this->userSession->isLoggedIn()) {