Skip to content

Commit 5213e5b

Browse files
icewind1991backportbot[bot]
authored andcommitted
fix: don't trigger moveShareInOrOutOfShare for reshares
Signed-off-by: Robin Appelman <robin@icewind.nl>
1 parent 5852d8a commit 5213e5b

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

apps/files_sharing/lib/Updater.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,12 @@ private static function moveShareInOrOutOfShare($path): void {
5050

5151
$src = $userFolder->get($path);
5252

53+
// if the share itself is being moved, we don't need to do anything,
54+
// since incoming shares can't be moved into other shares (and thus also not out of shares)
55+
if ($src->getMountPoint() instanceof SharedMount && $src->getInternalPath() === '') {
56+
return;
57+
}
58+
5359
$shareManager = Server::get(\OCP\Share\IManager::class);
5460

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

0 commit comments

Comments
 (0)