summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2017-05-12 11:33:54 -0500
committerGitHub <noreply@github.com>2017-05-12 11:33:54 -0500
commit3bf950307045c5d108d4f37aa2c4748d4127c8e2 (patch)
treea867262a3e6edc16dde6f64fee841eb11f07f576 /lib
parent2289ccd0ec72c54772c77f143886e84363099885 (diff)
parent51c55a867d78e3d6518d38ab2d5d15f1f2eb65cc (diff)
downloadnextcloud-server-3bf950307045c5d108d4f37aa2c4748d4127c8e2.tar.gz
nextcloud-server-3bf950307045c5d108d4f37aa2c4748d4127c8e2.zip
Merge pull request #4816 from nextcloud/Ardinis-quota-files_external
Correctly calculate used space for quota with external storage
Diffstat (limited to 'lib')
-rw-r--r--lib/private/legacy/helper.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/private/legacy/helper.php b/lib/private/legacy/helper.php
index 9c4bc895fb9..6775fe99dcd 100644
--- a/lib/private/legacy/helper.php
+++ b/lib/private/legacy/helper.php
@@ -537,7 +537,7 @@ class OC_Helper {
$includeExtStorage = \OC::$server->getSystemConfig()->getValue('quota_include_external_storage', false);
if (!$rootInfo) {
- $rootInfo = \OC\Files\Filesystem::getFileInfo($path, false);
+ $rootInfo = \OC\Files\Filesystem::getFileInfo($path, $includeExtStorage ? 'ext' : false);
}
if (!$rootInfo instanceof \OCP\Files\FileInfo) {
throw new \OCP\Files\NotFoundException();