Skip to content
Snippets Groups Projects
Commit fa3a65ae authored by Thomas Müller's avatar Thomas Müller
Browse files

Merge pull request #5325 from owncloud/setup-fs-on-apache-auth-backend

file system is now initialized with apache authentication as well
parents 9f8d52ee 5318df3b
Branches
No related tags found
No related merge requests found
...@@ -73,11 +73,7 @@ class OC_Connector_Sabre_Auth extends Sabre_DAV_Auth_Backend_AbstractBasic { ...@@ -73,11 +73,7 @@ class OC_Connector_Sabre_Auth extends Sabre_DAV_Auth_Backend_AbstractBasic {
*/ */
public function authenticate(Sabre_DAV_Server $server, $realm) { public function authenticate(Sabre_DAV_Server $server, $realm) {
if (OC_User::handleApacheAuth()) { if (OC_User::handleApacheAuth() || OC_User::isLoggedIn()) {
return true;
}
if (OC_User::isLoggedIn()) {
$user = OC_User::getUser(); $user = OC_User::getUser();
OC_Util::setupFS($user); OC_Util::setupFS($user);
$this->currentUser = $user; $this->currentUser = $user;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment