Skip to content

Commit 9b54383

Browse files
authored
Merge pull request #58835 from nextcloud/chore/fix-merge-leftover
Remove leftover useless path assignements in View
2 parents 78cfe37 + b0240a4 commit 9b54383

1 file changed

Lines changed: 0 additions & 5 deletions

File tree

lib/private/Files/View.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1649,9 +1649,6 @@ public function getDirectoryContent(string $directory, ?string $mimeTypeFilter =
16491649
$rootEntry['permissions'] = $rootEntry['permissions'] & ~Constants::PERMISSION_SHARE;
16501650
}
16511651

1652-
// FIXME: $user is null in encrypt:all occ command
1653-
$rootEntry['path'] = substr(Filesystem::normalizePath($path . '/' . $rootEntry['name']), strlen($user?->getUID() ?? '') + 2); // full path without /$user/
1654-
16551652
$ownerId = $subStorage->getOwner('');
16561653
if ($ownerId !== false) {
16571654
$owner = $this->getUserObjectForOwner($ownerId);
@@ -1765,7 +1762,6 @@ private function searchCommon($method, $args) {
17651762
if (substr($mountPoint . $result['path'], 0, $rootLength + 1) === $this->fakeRoot . '/') {
17661763
$internalPath = $result['path'];
17671764
$path = $mountPoint . $result['path'];
1768-
$result['path'] = substr($mountPoint . $result['path'], $rootLength);
17691765
$ownerId = $storage->getOwner($internalPath);
17701766
if ($ownerId !== false) {
17711767
$owner = $userManager->get($ownerId);
@@ -1788,7 +1784,6 @@ private function searchCommon($method, $args) {
17881784
if ($results) {
17891785
foreach ($results as $result) {
17901786
$internalPath = $result['path'];
1791-
$result['path'] = rtrim($relativeMountPoint . $result['path'], '/');
17921787
$path = rtrim($mountPoint . $internalPath, '/');
17931788
$ownerId = $storage->getOwner($internalPath);
17941789
if ($ownerId !== false) {

0 commit comments

Comments
 (0)