Skip to content

fix: don't trigger moveShareInOrOutOfShare for reshares #58121

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
icewind1991 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: don't trigger moveShareInOrOutOfShare for reshares #58121

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions apps/files_sharing/lib/Updater.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,12 @@ private static function moveShareInOrOutOfShare($path): void {
return;
}

// if the share itself is being moved, we don't need to do anything,
// since incoming shares can't be moved into other shares (and thus also not out of shares)
if ($src->getMountPoint() instanceof SharedMount && $src->getInternalPath() === '') {
return;
}

$shareManager = Server::get(\OCP\Share\IManager::class);

// We intentionally include invalid shares, as they have been automatically invalidated due to the node no longer
Expand Down
Loading