aboutsummaryrefslogtreecommitdiffstats
path: root/core/Controller
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2016-12-03 11:10:22 +0100
committerGitHub <noreply@github.com>2016-12-03 11:10:22 +0100
commit9eb1ea41ceda9f6e62da7322c31d8d697ae6cb86 (patch)
treee6cb9024d2a0ace60be4c5b22cbe99af167b0b07 /core/Controller
parentcd2c17bf83b41fef60b71d1430ae6ad973f946a1 (diff)
parent25a5c655f7cfb24b2bac597d6ec6ca68316098e9 (diff)
downloadnextcloud-server-9eb1ea41ceda9f6e62da7322c31d8d697ae6cb86.tar.gz
nextcloud-server-9eb1ea41ceda9f6e62da7322c31d8d697ae6cb86.zip
Merge pull request #2428 from justin-sleep/upstream
Fix #2427 by converting $remember to integer
Diffstat (limited to 'core/Controller')
-rw-r--r--core/Controller/LoginController.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/Controller/LoginController.php b/core/Controller/LoginController.php
index b1542de5d3c..c3ccac37f78 100644
--- a/core/Controller/LoginController.php
+++ b/core/Controller/LoginController.php
@@ -240,7 +240,7 @@ class LoginController extends Controller {
// TODO: remove password checks from above and let the user session handle failures
// requires https://github.com/owncloud/core/pull/24616
$this->userSession->login($user, $password);
- $this->userSession->createSessionToken($this->request, $loginResult->getUID(), $user, $password, $remember_login);
+ $this->userSession->createSessionToken($this->request, $loginResult->getUID(), $user, $password, (int)$remember_login);
// User has successfully logged in, now remove the password reset link, when it is available
$this->config->deleteUserValue($loginResult->getUID(), 'core', 'lostpassword');