mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2301 from nextcloud/pass-confirm-cookie-login 

fix password check when using remember me login
This commit is contained in:
Roeland Jago Douma 2016-11-24 20:39:13 +01:00 committed by GitHub
parent 147b3d6f00 dd7d493e4d
commit 5fb43b1cc9
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/private/Template/JSConfigHelper.php
View File

@ -127,10 +127,9 @@ class JSConfigHelper {
}
if ($this->currentUser instanceof IUser) {
$lastConfirmTimestamp = $this->currentUser->getLastLogin();
$sessionTime = $this->session->get('last-password-confirm');
if (is_int($sessionTime)) {
$lastConfirmTimestamp = $sessionTime;
$lastConfirmTimestamp = $this->session->get('last-password-confirm');
if (!is_int($lastConfirmTimestamp)) {
$lastConfirmTimestamp = 0;
}
} else {
$lastConfirmTimestamp = 0;