file system is now initialized with apache authentication as well

remotes/origin/stable6
Thomas Müller 13 years ago
parent e9ce704f17
commit fb3829e8b8
  1. 8
      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);

Loading…
Cancel
Save