From 347d786a14e5b59974488acbfb5549bb9604cd05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=B4me=20Chilliet?= Date: Tue, 10 Mar 2026 15:09:54 +0100 Subject: [PATCH 1/2] chore: Remove useless assignement MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Because of the order we merged PRs, this line was not removed while the value is not used anymore, let’s cleanup. Signed-off-by: Côme Chilliet --- lib/private/Files/View.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/lib/private/Files/View.php b/lib/private/Files/View.php index 21265b7d0483b..0cde8a3c41861 100644 --- a/lib/private/Files/View.php +++ b/lib/private/Files/View.php @@ -1649,9 +1649,6 @@ public function getDirectoryContent(string $directory, ?string $mimeTypeFilter = $rootEntry['permissions'] = $rootEntry['permissions'] & ~Constants::PERMISSION_SHARE; } - // FIXME: $user is null in encrypt:all occ command - $rootEntry['path'] = substr(Filesystem::normalizePath($path . '/' . $rootEntry['name']), strlen($user?->getUID() ?? '') + 2); // full path without /$user/ - $ownerId = $subStorage->getOwner(''); if ($ownerId !== false) { $owner = $this->getUserObjectForOwner($ownerId); From b0240a43af873d9bb583548ba84a989b7541248c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=B4me=20Chilliet?= Date: Tue, 10 Mar 2026 15:12:06 +0100 Subject: [PATCH 2/2] chore: Remove other useless assignment of 'path' key for FileInfo MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Côme Chilliet --- lib/private/Files/View.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/private/Files/View.php b/lib/private/Files/View.php index 0cde8a3c41861..c3caead2e1c32 100644 --- a/lib/private/Files/View.php +++ b/lib/private/Files/View.php @@ -1762,7 +1762,6 @@ private function searchCommon($method, $args) { if (substr($mountPoint . $result['path'], 0, $rootLength + 1) === $this->fakeRoot . '/') { $internalPath = $result['path']; $path = $mountPoint . $result['path']; - $result['path'] = substr($mountPoint . $result['path'], $rootLength); $ownerId = $storage->getOwner($internalPath); if ($ownerId !== false) { $owner = $userManager->get($ownerId); @@ -1785,7 +1784,6 @@ private function searchCommon($method, $args) { if ($results) { foreach ($results as $result) { $internalPath = $result['path']; - $result['path'] = rtrim($relativeMountPoint . $result['path'], '/'); $path = rtrim($mountPoint . $internalPath, '/'); $ownerId = $storage->getOwner($internalPath); if ($ownerId !== false) {