summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2017-01-30 19:30:04 -0600
committerGitHub <noreply@github.com>2017-01-30 19:30:04 -0600
commit5bad417e57231e129b7113ebb110b1f2b282f349 (patch)
tree77f5d78e2bd4cd4fe3a70e1659875cce4d832c56 /core
parente50320dc71135bf546c757f7dea6e23f5f48a906 (diff)
parent3ee5c7ea4e508b4945646013f871ad532d09ddbd (diff)
downloadnextcloud-server-5bad417e57231e129b7113ebb110b1f2b282f349.tar.gz
nextcloud-server-5bad417e57231e129b7113ebb110b1f2b282f349.zip
Merge pull request #2044 from nextcloud/login-credential-store
Login credential store
Diffstat (limited to 'core')
-rw-r--r--core/Controller/LoginController.php1
-rw-r--r--core/templates/login.php2
2 files changed, 0 insertions, 3 deletions
diff --git a/core/Controller/LoginController.php b/core/Controller/LoginController.php
index 2509cdf0bde..52bd2213954 100644
--- a/core/Controller/LoginController.php
+++ b/core/Controller/LoginController.php
@@ -159,7 +159,6 @@ class LoginController extends Controller {
}
$parameters['alt_login'] = OC_App::getAlternativeLogIns();
- $parameters['rememberLoginAllowed'] = OC_Util::rememberLoginAllowed();
$parameters['rememberLoginState'] = !empty($remember_login) ? $remember_login : 0;
if (!is_null($user) && $user !== '') {
diff --git a/core/templates/login.php b/core/templates/login.php
index c200dfe366b..221242c0dcb 100644
--- a/core/templates/login.php
+++ b/core/templates/login.php
@@ -68,7 +68,6 @@ script('core', [
<input type="submit" id="submit" class="login primary icon-confirm-white" title="" value="<?php p($l->t('Log in')); ?>" disabled="disabled" />
<div class="login-additional">
- <?php if ($_['rememberLoginAllowed'] === true) : ?>
<div class="remember-login-container">
<?php if ($_['rememberLoginState'] === 0) { ?>
<input type="checkbox" name="remember_login" value="1" id="remember_login" class="checkbox checkbox--white">
@@ -77,7 +76,6 @@ script('core', [
<?php } ?>
<label for="remember_login"><?php p($l->t('Stay logged in')); ?></label>
</div>
- <?php endif; ?>
</div>
<input type="hidden" name="timezone_offset" id="timezone_offset"/>