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
diff options
context:
space:
mode:
authorRobin Appelman <robin@icewind.nl>2022-05-11 12:41:00 +0300
committerbackportbot-nextcloud[bot] <backportbot-nextcloud[bot]@users.noreply.github.com>2022-05-12 22:02:45 +0300
commitcc4aab14d730fcc23ed40c4aff6dbf49cea78f7f (patch)
treeba6ef95a91bf660fd5fa40850bc380e6a42f2764
parent8aa4b1377f217f84667a2cdd01afcae99197a574 (diff)
don't unjail the path when getting the storage infobackport/32335/stable24
the original reason for adding it no longer exist. This was added with #30985 since then the share source storage was also used, however this was changed with #32076 Signed-off-by: Robin Appelman <robin@icewind.nl>
-rw-r--r--lib/private/legacy/OC_Helper.php5
1 files changed, 1 insertions, 4 deletions
diff --git a/lib/private/legacy/OC_Helper.php b/lib/private/legacy/OC_Helper.php
index 0d1903007c2..6aa0b582c21 100644
--- a/lib/private/legacy/OC_Helper.php
+++ b/lib/private/legacy/OC_Helper.php
@@ -519,9 +519,6 @@ class OC_Helper {
$sourceStorage = $storage;
if ($storage->instanceOfStorage('\OCA\Files_Sharing\SharedStorage')) {
$includeExtStorage = false;
- $internalPath = $storage->getUnjailedPath($rootInfo->getInternalPath());
- } else {
- $internalPath = $rootInfo->getInternalPath();
}
if ($includeExtStorage) {
if ($storage->instanceOfStorage('\OC\Files\Storage\Home')
@@ -545,7 +542,7 @@ class OC_Helper {
$quota = $sourceStorage->getQuota();
}
try {
- $free = $sourceStorage->free_space($internalPath);
+ $free = $sourceStorage->free_space($rootInfo->getInternalPath());
} catch (\Exception $e) {
if ($path === "") {
throw $e;