From dd7d493e4d138a3f5550a8d7a0b740d2fa367bd7 Mon Sep 17 00:00:00 2001
From: Robin Appelman <robin@icewind.nl>
Date: Thu, 24 Nov 2016 11:57:10 +0100
Subject: [PATCH] fix password check when using remember me login

Signed-off-by: Robin Appelman <robin@icewind.nl>
---
 lib/private/Template/JSConfigHelper.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/lib/private/Template/JSConfigHelper.php b/lib/private/Template/JSConfigHelper.php
index a724c124de..f17c6a1619 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;