diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-10-16 04:23:45 -0700 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-10-16 04:23:45 -0700 |
| commit | fa3a65aea786fc2c2e2023436feb35ea64edc57a (patch) | |
| tree | 6a4ae7074ec234487fb4d220f1d2ec9bea1b23eb /lib/private/connector | |
| parent | 9f8d52ee44a425e6afc32782d1cd51e6e7225a9a (diff) | |
| parent | 5318df3b3c45e9a5e99ac4eae62f909542de52ed (diff) | |
| download | nextcloud-server-fa3a65aea786fc2c2e2023436feb35ea64edc57a.tar.gz nextcloud-server-fa3a65aea786fc2c2e2023436feb35ea64edc57a.zip | |
Merge pull request #5325 from owncloud/setup-fs-on-apache-auth-backend
file system is now initialized with apache authentication as well
Diffstat (limited to 'lib/private/connector')
| -rw-r--r-- | lib/private/connector/sabre/auth.php | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/lib/private/connector/sabre/auth.php b/lib/private/connector/sabre/auth.php index d2fd74c44f9..0c84fa6b757 100644 --- a/lib/private/connector/sabre/auth.php +++ b/lib/private/connector/sabre/auth.php @@ -73,11 +73,7 @@ class OC_Connector_Sabre_Auth extends Sabre_DAV_Auth_Backend_AbstractBasic { */ public function authenticate(Sabre_DAV_Server $server, $realm) { - if (OC_User::handleApacheAuth()) { - return true; - } - - if (OC_User::isLoggedIn()) { + if (OC_User::handleApacheAuth() || OC_User::isLoggedIn()) { $user = OC_User::getUser(); OC_Util::setupFS($user); $this->currentUser = $user; |