diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-09-30 10:53:41 -0700 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-09-30 10:53:41 -0700 |
| commit | b58a464b864e70076aa0bde6d70c727b2aa32397 (patch) | |
| tree | 3d8f3fd15d2efcd25c92991e42d53341aec33d32 /lib/base.php | |
| parent | a711399e62d5a9f14d4b748efe4354ee37e61f13 (diff) | |
| parent | 7e54e8831e1004575ed9feab9a65f11365e4a473 (diff) | |
| download | nextcloud-server-b58a464b864e70076aa0bde6d70c727b2aa32397.tar.gz nextcloud-server-b58a464b864e70076aa0bde6d70c727b2aa32397.zip | |
Merge pull request #4967 from owncloud/dont_remember_login_if_enc_enabled
don't remember login if the encrypion app is enabled
Diffstat (limited to 'lib/base.php')
| -rw-r--r-- | lib/base.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/base.php b/lib/base.php index 58894be03ee..036051119de 100644 --- a/lib/base.php +++ b/lib/base.php @@ -770,6 +770,7 @@ class OC { || !isset($_COOKIE["oc_token"]) || !isset($_COOKIE["oc_username"]) || !$_COOKIE["oc_remember_login"] + || !OC_Util::rememberLoginAllowed() ) { return false; } |