From: Thomas Müller <thomas.mueller@tmit.eu>
Date: Mon, 14 Oct 2013 12:46:43 +0000 (+0200)
Subject: file system is now initialized with apache authentication as well
X-Git-Tag: v6.0.0beta2~106^2~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=fb3829e8b89237c12048344fb6b2fd6151ee0d76;p=nextcloud-server.git

file system is now initialized with apache authentication as well
---

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);