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:
authorCarl Schwan <carl@carlschwan.eu>2022-05-13 14:24:57 +0300
committerGitHub <noreply@github.com>2022-05-13 14:24:57 +0300
commit861a7870863c41df28882d8b5fec7cb5ce44a4b9 (patch)
tree2b1c1fc450cdc4549d914baa06ad2280f6d9283b
parent2d52bda1ed23877142ad2632cc98d62941ad987c (diff)
parentcc4aab14d730fcc23ed40c4aff6dbf49cea78f7f (diff)
Merge pull request #32365 from nextcloud/backport/32335/stable24
[stable24] don't unjail the path when getting the storage info
-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;