diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-10-14 14:46:43 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-10-14 14:46:43 +0200 |
| commit | fb3829e8b89237c12048344fb6b2fd6151ee0d76 (patch) | |
| tree | d5fbfe0a8f592833a08799992b20a76a1a24f69b | |
| parent | e9ce704f17663906aa8ab4da5145c61eb527e662 (diff) | |
| download | nextcloud-server-fb3829e8b89237c12048344fb6b2fd6151ee0d76.tar.gz nextcloud-server-fb3829e8b89237c12048344fb6b2fd6151ee0d76.zip | |
file system is now initialized with apache authentication as well
| -rw-r--r-- | lib/private/connector/sabre/auth.php | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/lib/private/connector/sabre/auth.php b/lib/private/connector/sabre/auth.php index d2fd74c44f9..5491d376316 100644 --- a/lib/private/connector/sabre/auth.php +++ b/lib/private/connector/sabre/auth.php @@ -73,15 +73,11 @@ 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; - return true; + return true; } return parent::authenticate($server, $realm); |