Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2020-10-01 16:11:16 +0300
committerGitHub <noreply@github.com>2020-10-01 16:11:16 +0300
commit07c188e7e3bbb0d60070ee8824bd8ccdeaf048a7 (patch)
treed9bb512412b961fe41ae84375e12c67bea7651d2 /lib
parent79660f68281f9a5d3aa06e394886d228b353a318 (diff)
parent89315a1e87012cb966d84dc2b81e453a31c923e2 (diff)
Merge pull request #22443 from nextcloud/backport/22421/stable18
[stable18] show better quota warning for group folders and external storage
Diffstat (limited to 'lib')
-rw-r--r--lib/private/legacy/helper.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/private/legacy/helper.php b/lib/private/legacy/helper.php
index 19c9ca7f91c..0f7b2d1b3af 100644
--- a/lib/private/legacy/helper.php
+++ b/lib/private/legacy/helper.php
@@ -494,7 +494,8 @@ class OC_Helper {
$used = 0;
}
$quota = \OCP\Files\FileInfo::SPACE_UNLIMITED;
- $storage = $rootInfo->getStorage();
+ $mount = $rootInfo->getMountPoint();
+ $storage = $mount->getStorage();
$sourceStorage = $storage;
if ($storage->instanceOfStorage('\OCA\Files_Sharing\SharedStorage')) {
$includeExtStorage = false;
@@ -552,6 +553,7 @@ class OC_Helper {
'relative' => $relative,
'owner' => $ownerId,
'ownerDisplayName' => $ownerDisplayName,
+ 'mountType' => $mount->getMountType()
];
}