diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-09-30 21:29:58 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-09-30 21:29:58 +0200 |
| commit | 02d69762631edda67e56ff652c67dd12fef098fd (patch) | |
| tree | c1bfbe928de9f50f67b88bbd42f23f0fb228f635 /lib/base.php | |
| parent | 8e0060405dd585a33f58d6a5520532726b3af5d6 (diff) | |
| parent | b58a464b864e70076aa0bde6d70c727b2aa32397 (diff) | |
| download | nextcloud-server-02d69762631edda67e56ff652c67dd12fef098fd.tar.gz nextcloud-server-02d69762631edda67e56ff652c67dd12fef098fd.zip | |
Merge branch 'master' into lib-private-master-2
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 7e237c35d27..42182c21fb0 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; } |