[stable28] fix: improve checks for moving shares/storages into other mounts #50160
+121
−13
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![backportbot[bot]](https://avatars.githubusercontent.com/in/60201?s=60&v=4){kind=small}
Signed-off-by: Robin Appelman <[email protected]>
Signed-off-by: Christopher Ng <[email protected]>
Signed-off-by: Robin Appelman <[email protected]>
Signed-off-by: nextcloud-command <[email protected]>
Signed-off-by: Robin Appelman <[email protected]> [skip ci]
backportbot
bot
added
3. to review
|
/compile / |
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
Signed-off-by: nextcloud-command <[email protected]>
hamza221
force-pushed
the
backport/49552/stable28
branch
from
63827ed to
a19a04a
Compare
|
@icewind1991 I tried to fix the PSALM warnings, can you please double check If I did something wrong |
| @@ -806,13 +827,19 @@ | |||
| } | |||
| // moving a file/folder within the same mount point | |||
| } elseif ($storage1 === $storage2) { | |||
| if (count($movedMounts) > 0) { | |||
| $this->validateMountMove($movedMounts, $mount1, $mount2, !$this->targetIsNotShared($targetUser, $absolutePath2)); | |||
Check failure
Code scanning / Psalm
InvalidArgument Error
| if ($storage1) { | ||
| $result = $storage1->rename($internalPath1, $internalPath2); | ||
| } else { | ||
| $result = false; | ||
| } | ||
| // moving a file/folder between storages (from $storage1 to $storage2) | ||
| } else { | ||
| if (count($movedMounts) > 0) { | ||
| $this->validateMountMove($movedMounts, $mount1, $mount2, !$this->targetIsNotShared($targetUser, $absolutePath2)); |
Check failure
Code scanning / Psalm
InvalidArgument Error
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Backport of #49552
Warning, This backport's changes differ from the original and might be incomplete⚠️
Todo
Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.