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-11-16 21:29:10 +0300
committerGitHub <noreply@github.com>2020-11-16 21:29:10 +0300
commit5aca22f825992a07e7aae5a437a9395ef4203ed8 (patch)
tree1d096820b7e9ed997be02f51145d39e0cbd67334 /lib
parent93b9cab7b2ad67098c4b81bb89f11dbb8c84acde (diff)
parente29eb55f8b709c420689571964dae8e36b18fa37 (diff)
Merge pull request #24078 from nextcloud/backport/23168/stable18
[stable18] add mount point to quota warning message
Diffstat (limited to 'lib')
-rw-r--r--lib/private/legacy/helper.php8
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/private/legacy/helper.php b/lib/private/legacy/helper.php
index 0f7b2d1b3af..ae933421bce 100644
--- a/lib/private/legacy/helper.php
+++ b/lib/private/legacy/helper.php
@@ -544,6 +544,11 @@ class OC_Helper {
if($owner) {
$ownerDisplayName = $owner->getDisplayName();
}
+ if (substr_count($mount->getMountPoint(), '/') < 3) {
+ $mountPoint = '';
+ } else {
+ [,,,$mountPoint] = explode('/', $mount->getMountPoint(), 4);
+ }
return [
'free' => $free,
@@ -553,7 +558,8 @@ class OC_Helper {
'relative' => $relative,
'owner' => $ownerId,
'ownerDisplayName' => $ownerDisplayName,
- 'mountType' => $mount->getMountType()
+ 'mountType' => $mount->getMountType(),
+ 'mountPoint' => trim($mountPoint, '/'),
];
}