Skip to content

[stable29] Encryption trash fixes #3484

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

Merged
icewind1991 merged 9 commits into from
Dec 13, 2024
Merged

[stable29] Encryption trash fixes #3484

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
771939e
fix: fix missing dot in unique name when restoring from trash
icewind1991 Nov 13, 2024
2652ce8
fix: remove manual un-jailing when moving to trash as the storage now…
icewind1991 Nov 13, 2024
29ca0d2
fix: use "full" target folder from user when restoring trash items
icewind1991 Nov 13, 2024
aa6fe34
fix: make root cache entry optional for groupfolder storage
icewind1991 Nov 18, 2024
8adb8e9
fix: create a separate mount for trashbin to make encryption work
icewind1991 Nov 18, 2024
8e11625
fix: fix moving files to trash
icewind1991 Nov 18, 2024
c2c264b
fix: add fallback behavior for pre-fix trashbin restore
icewind1991 Nov 27, 2024
4d0e5a1
chore: formatting
icewind1991 Dec 11, 2024
1366597
chore: psalm fixes
icewind1991 Nov 28, 2024
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
Next Next commit
fix: fix missing dot in unique name when restoring from trash 
Signed-off-by: Robin Appelman <[email protected]>
  • Loading branch information
@icewind1991
icewind1991 committed Dec 12, 2024
commit 771939e6cdcdebf762b4f409cb35aa56fd637f9a
2 changes: 1 addition & 1 deletion lib/Trash/TrashBackend.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ public function restoreItem(ITrashItem $item) {
$target .= ' (' . $i . ')';

if (isset($info['extension'])) {
$target .= $info['extension'];
$target .= '.' . $info['extension'];
}

return $target;
Expand Down