mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

file system is now initialized with apache authentication as well
This commit is contained in:
Thomas Müller 2013-10-16 04:23:45 -07:00
parent 9f8d52ee44 5318df3b3c
commit fa3a65aea7
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/private/connector/sabre/auth.php
View File

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