diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2016-11-24 20:39:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-24 20:39:13 +0100 |
| commit | 5fb43b1cc9a29409e75304716c42ad30945127f3 (patch) | |
| tree | c7bb31257c34f4c1e9c3af6c911c305805f26235 | |
| parent | 147b3d6f00db4b891b3afaa2299f155eef2b3551 (diff) | |
| parent | dd7d493e4d138a3f5550a8d7a0b740d2fa367bd7 (diff) | |
| download | nextcloud-server-5fb43b1cc9a29409e75304716c42ad30945127f3.tar.gz nextcloud-server-5fb43b1cc9a29409e75304716c42ad30945127f3.zip | |
Merge pull request #2301 from nextcloud/pass-confirm-cookie-login
fix password check when using remember me login
| -rw-r--r-- | lib/private/Template/JSConfigHelper.php | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/private/Template/JSConfigHelper.php b/lib/private/Template/JSConfigHelper.php index a724c124de0..f17c6a16194 100644 --- a/lib/private/Template/JSConfigHelper.php +++ b/lib/private/Template/JSConfigHelper.php @@ -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; |