]> source.dussan.org Git - nextcloud-server.git/commitdiff
fix password check when using remember me login 2301/head
authorRobin Appelman <robin@icewind.nl>
Thu, 24 Nov 2016 10:57:10 +0000 (11:57 +0100)
committerRobin Appelman <robin@icewind.nl>
Thu, 24 Nov 2016 10:57:10 +0000 (11:57 +0100)
Signed-off-by: Robin Appelman <robin@icewind.nl>
lib/private/Template/JSConfigHelper.php

index a724c124de0e40d82b2ee626e7dc05378d4ddb7f..f17c6a16194158dffa8c3b80310732733d39ab8d 100644 (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;