diff options
| author | Vincent Petry <pvince81@owncloud.com> | 2016-06-09 16:28:06 +0200 |
|---|---|---|
| committer | Vincent Petry <pvince81@owncloud.com> | 2016-06-09 16:28:06 +0200 |
| commit | 6ba18934e6f095de08bec7bdc10c45485eeb5cc7 (patch) | |
| tree | 35f0b0e84da656ef0a7cf3975b5ba05e301149d4 /apps | |
| parent | ac163426ef3db18a603c07f0e2b24f00e1cdc673 (diff) | |
| parent | f20c617154cbc6d53bc52a4e81129dd4e0e22a70 (diff) | |
| download | nextcloud-server-6ba18934e6f095de08bec7bdc10c45485eeb5cc7.tar.gz nextcloud-server-6ba18934e6f095de08bec7bdc10c45485eeb5cc7.zip | |
Merge pull request #25000 from owncloud/fix-email-login-dav
Allow login by email address via webdav as well
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/dav/lib/Connector/Sabre/Auth.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/dav/lib/Connector/Sabre/Auth.php b/apps/dav/lib/Connector/Sabre/Auth.php index 7b959a0d899..27900cc1cad 100644 --- a/apps/dav/lib/Connector/Sabre/Auth.php +++ b/apps/dav/lib/Connector/Sabre/Auth.php @@ -110,10 +110,10 @@ class Auth extends AbstractBasic { $this->session->close(); return true; } else { - \OC_Util::setUpFS(); //login hooks may need early access to the filesystem + \OC_Util::setupFS(); //login hooks may need early access to the filesystem if($this->userSession->logClientIn($username, $password)) { $this->userSession->createSessionToken($this->request, $this->userSession->getUser()->getUID(), $username, $password); - \OC_Util::setUpFS($this->userSession->getUser()->getUID()); + \OC_Util::setupFS($this->userSession->getUser()->getUID()); $this->session->set(self::DAV_AUTHENTICATED, $this->userSession->getUser()->getUID()); $this->session->close(); return true; |