diff options
| author | Bjoern Schiessle <schiessle@owncloud.com> | 2013-09-24 20:01:34 +0400 |
|---|---|---|
| committer | Bjoern Schiessle <schiessle@owncloud.com> | 2013-09-30 23:47:55 +0400 |
| commit | 61752fa8d132af13e7121b7ecfdba13bd179d37b (patch) | |
| tree | 302198872ede103073ca9a09691135129f52d5f9 /lib/base.php | |
| parent | f95da8ba592ad45b802997b74693565292524259 (diff) | |
introduce OC_Util::rememberLoginAllowed()
Conflicts:
core/templates/login.php
lib/util.php
Diffstat (limited to 'lib/base.php')
| -rw-r--r-- | lib/base.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/base.php b/lib/base.php index c9551cd2749..2ac58b259b2 100644 --- a/lib/base.php +++ b/lib/base.php @@ -746,7 +746,7 @@ class OC { || !isset($_COOKIE["oc_token"]) || !isset($_COOKIE["oc_username"]) || !$_COOKIE["oc_remember_login"] - || OC_App::isEnabled('files_encryption') + || !OC_Util::rememberLoginAllowed() ) { return false; } |