From caee215120434420ba3f9cafd5b21c19b306d20d Mon Sep 17 00:00:00 2001
From: Roeland Jago Douma <roeland@famdouma.nl>
Date: Fri, 6 Apr 2018 15:44:28 +0200
Subject: [PATCH] Always remember me

Fixes #8004

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
---
 core/Controller/LoginController.php |  4 +---
 core/templates/login.php            | 10 ----------
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/core/Controller/LoginController.php b/core/Controller/LoginController.php
index d0a91320e1..fae997b1c6 100644
--- a/core/Controller/LoginController.php
+++ b/core/Controller/LoginController.php
@@ -184,8 +184,6 @@ class LoginController extends Controller {
 		}
 
 		$parameters['alt_login'] = OC_App::getAlternativeLogIns();
-		$parameters['rememberLoginState'] = !empty($remember_login) ? $remember_login : 0;
-		$parameters['hideRemeberLoginState'] = !empty($redirect_url) && $this->session->exists('client.flow.state.token');
 
 		if ($user !== null && $user !== '') {
 			$parameters['loginName'] = $user;
@@ -240,7 +238,7 @@ class LoginController extends Controller {
 	 * @param string $timezone_offset
 	 * @return RedirectResponse
 	 */
-	public function tryLogin($user, $password, $redirect_url, $remember_login = false, $timezone = '', $timezone_offset = '') {
+	public function tryLogin($user, $password, $redirect_url, $remember_login = true, $timezone = '', $timezone_offset = '') {
 		if(!is_string($user)) {
 			throw new \InvalidArgumentException('Username must be string');
 		}
diff --git a/core/templates/login.php b/core/templates/login.php
index 3633400b31..ee1ce6a687 100644
--- a/core/templates/login.php
+++ b/core/templates/login.php
@@ -76,16 +76,6 @@ script('core', 'merged-login');
 		<?php } ?>
 
 		<div class="login-additional">
-			<?php if (!$_['hideRemeberLoginState']) { ?>
-			<div class="remember-login-container">
-				<?php if ($_['rememberLoginState'] === 0) { ?>
-				<input type="checkbox" name="remember_login" value="1" id="remember_login" class="checkbox checkbox--white">
-				<?php } else { ?>
-				<input type="checkbox" name="remember_login" value="1" id="remember_login" class="checkbox checkbox--white" checked="checked">
-				<?php } ?>
-				<label for="remember_login"><?php p($l->t('Stay logged in')); ?></label>
-			</div>
-			<?php } ?>
 			<?php if (!empty($_['canResetPassword'])) { ?>
 			<div class="lost-password-container">
 				<a id="lost-password" href="<?php p($_['resetPasswordLink']); ?>">