upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-09 00:32:29 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 35

Merge pull request #58835 from nextcloud/chore/fix-merge-leftover

Browse source 
Remove leftover useless path assignements in View
This commit is contained in:
Côme Chilliet 2026-03-11 16:52:55 +01:00 committed by GitHub
commit 9b54383532
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 0 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/private/Files/View.php
View file

@ -1649,9 +1649,6 @@ class View {
$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);
@ -1765,7 +1762,6 @@ class View {
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);
@ -1788,7 +1784,6 @@ class View {
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) {