diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/js/login.js | 5 | ||||
| -rw-r--r-- | core/templates/login.php | 7 |
2 files changed, 3 insertions, 9 deletions
diff --git a/core/js/login.js b/core/js/login.js index 186b21423f3..33ec868cb23 100644 --- a/core/js/login.js +++ b/core/js/login.js @@ -21,9 +21,4 @@ OC.Login = _.extend(OC.Login || {}, { }); $(document).ready(function() { $('form[name=login]').submit(OC.Login.onLogin); - - //set previous state of remember login checkbox - if($('label[for="remember_login"]').attr('previously') === 'checked'){ - $('#remember_login').prop('checked', true); - } }); diff --git a/core/templates/login.php b/core/templates/login.php index 590b035bce3..a12008295c4 100644 --- a/core/templates/login.php +++ b/core/templates/login.php @@ -67,13 +67,12 @@ script('core', [ <?php } ?> <?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"> - <?php if ($_POST['remember_login'] !== '1') { ?> - <label for="remember_login"> <?php } else { ?> - <label previously="checked" for="remember_login"> + <input type="checkbox" name="remember_login" value="1" id="remember_login" class="checkbox checkbox--white" checked="checked"> <?php } ?> - <?php p($l->t('Stay logged in')); ?></label> + <label for="remember_login"><?php p($l->t('Stay logged in')); ?></label> </div> <?php endif; ?> <input type="hidden" name="timezone-offset" id="timezone-offset"/> |