diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2020-04-30 09:13:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-30 09:13:19 +0200 |
| commit | b8b53a2d9a1cd12d112116151d32ff400f518524 (patch) | |
| tree | b4694731090828eca9c325a3d324dc55b40f37e3 /apps/dav/lib/Connector/Sabre | |
| parent | a1f3293c06648f6b3c36353edb4a04794fabbba9 (diff) | |
| parent | 902d12555e0e4347cef82da0a6bc9283f7394cd0 (diff) | |
| download | nextcloud-server-b8b53a2d9a1cd12d112116151d32ff400f518524.tar.gz nextcloud-server-b8b53a2d9a1cd12d112116151d32ff400f518524.zip | |
Merge pull request #19436 from nextcloud/bugfix/noid/dav-quota-calculation
Do not include mountpoints when calculating quota usage on WebDAV
Diffstat (limited to 'apps/dav/lib/Connector/Sabre')
| -rw-r--r-- | apps/dav/lib/Connector/Sabre/Directory.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/apps/dav/lib/Connector/Sabre/Directory.php b/apps/dav/lib/Connector/Sabre/Directory.php index a7c319b4eee..e49a2ac3fe6 100644 --- a/apps/dav/lib/Connector/Sabre/Directory.php +++ b/apps/dav/lib/Connector/Sabre/Directory.php @@ -326,7 +326,8 @@ class Directory extends \OCA\DAV\Connector\Sabre\Node implements \Sabre\DAV\ICol return $this->quotaInfo; } try { - $storageInfo = \OC_Helper::getStorageInfo($this->info->getPath(), $this->info); + $info = $this->fileView->getFileInfo($this->path, false); + $storageInfo = \OC_Helper::getStorageInfo($this->info->getPath(), $info); if ($storageInfo['quota'] === \OCP\Files\FileInfo::SPACE_UNLIMITED) { $free = \OCP\Files\FileInfo::SPACE_UNLIMITED; } else { |