fix(files_trashbin): create folder if missing when expiring trash#61442
Merged
Conversation
8 tasks
|
The PR also solves the issue for NC 34 |
twrm
reviewed
Jun 19, 2026
fa93943 to
359aeda
Compare
|
can this PR also be backported to NC 34 ? |
CarlSchwan
approved these changes
Jun 22, 2026
susnux
approved these changes
Jun 22, 2026
Contributor
|
/backport to stable34 |
Contributor
|
/backport to stable33 |
Signed-off-by: invario <67800603+invario@users.noreply.github.com>
359aeda to
34e255d
Compare
|
The backport to # Switch to the target branch and update it
git checkout stable33
git pull origin stable33
# Create the new backport branch
git checkout -b backport/61442/stable33
# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts, resolve them
git cherry-pick 34e255d1
# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/61442/stable33Error: Failed to check for changes with origin/stable33: No changes found in backport branch Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports. |
Contributor
Author
|
Backport to 33 shouldn't be needed as the offending code isn't present yet (introduced in commit a8d69ff). Also, thanks for the merge! |
|
yes, in NC 33, the bug didn't occur. So, no backport needed. |
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
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.
Summary
If the background job to expire trash was executed before a user had ever trashed a file, the
files_trashbinfolder would be missing and an exception was thrown. Change the method used fromgettogetOrCreateFolderinstead.Checklist
3. to review, feature component)stable32)