Skip to content

Commit

Permalink
don't unjail the path when getting the storage info
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
icewind1991 authored and backportbot-nextcloud[bot] committed May 12, 2022
1 parent 8aa4b13 commit cc4aab1
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions lib/private/legacy/OC_Helper.php
Original file line number Diff line number Diff line change
Expand Up @@ -519,9 +519,6 @@ public static function getStorageInfo($path, $rootInfo = null, $includeMountPoin
$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')
Expand All @@ -545,7 +542,7 @@ public static function getStorageInfo($path, $rootInfo = null, $includeMountPoin
$quota = $sourceStorage->getQuota();
}
try {
$free = $sourceStorage->free_space($internalPath);
$free = $sourceStorage->free_space($rootInfo->getInternalPath());
} catch (\Exception $e) {
if ($path === "") {
throw $e;
Expand Down

0 comments on commit cc4aab1

Please sign in to comment.