diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2014-03-06 00:15:08 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2014-03-06 00:15:08 +0100 |
| commit | 32b29c9d735ae235641a7ea3869c14d7eb69cb4f (patch) | |
| tree | 63e4e269bd33b0688965c9b3b1059466a8f502b8 /lib/base.php | |
| parent | 6de370b64cb8f7fcd9d3bd090b8d801d91d2fcca (diff) | |
| parent | 1785c0c9b9fcdc6e9a8e58f13f45e5b53364882a (diff) | |
| download | nextcloud-server-32b29c9d735ae235641a7ea3869c14d7eb69cb4f.tar.gz nextcloud-server-32b29c9d735ae235641a7ea3869c14d7eb69cb4f.zip | |
Merge branch 'master' into fix-7307
Conflicts:
core/js/router.js
settings/js/admin.js
Diffstat (limited to 'lib/base.php')
| -rw-r--r-- | lib/base.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/base.php b/lib/base.php index 7703e83ec2e..a44db8fd4db 100644 --- a/lib/base.php +++ b/lib/base.php @@ -553,7 +553,8 @@ class OC { OC_User::useBackend(new OC_User_Database()); OC_Group::useBackend(new OC_Group_Database()); - if (isset($_SERVER['PHP_AUTH_USER']) && self::$session->exists('loginname') + $basic_auth = OC_Config::getValue('basic_auth', true); + if ($basic_auth && isset($_SERVER['PHP_AUTH_USER']) && self::$session->exists('loginname') && $_SERVER['PHP_AUTH_USER'] !== self::$session->get('loginname')) { $sessionUser = self::$session->get('loginname'); $serverUser = $_SERVER['PHP_AUTH_USER']; |