Skip to content

[stable33] fix(attachments): normalize attachment names to Unicode NFC - #9394

Merged
mejo- merged 1 commit into
stable33from
backport/9388/stable33
Oct 15, 2026
Merged

mejo- merged 1 commit into
stable33from
backport/9388/stable33

Conversation

@backportbot

@backportbot backportbot Bot commented Oct 15, 2026

Copy link
Copy Markdown

Backport of PR #9388

@backportbot
backportbot Bot requested a review from samin-z October 15, 2026 09:31
@backportbot backportbot Bot added this to the Nextcloud 33.0.11 milestone Oct 15, 2026
@mejo-
mejo- force-pushed the backport/9388/stable33 branch from 8a620d6 to 45a101b Compare October 15, 2026 12:22
@mejo-
mejo- enabled auto-merge October 15, 2026 12:23
Files uploaded from macOS in Chrome or Firefox have NFD names, while the
filecache, and therefore the attachment list, stores names in NFC. The
upload response returned the raw NFD name, so the editor inserted an NFD
`src`. AttachmentResolver compared names exactly, found no matching
attachment and fell back to loading the file as an image, which failed.

Normalize uploaded names to NFC before saving them, and compare names
in NFC in AttachmentResolver so that documents that already contain NFD
srcs resolve as well.

Fixes: #7873
Refs: nextcloud/server#65514
Refs: nextcloud/collectives#2327

Signed-off-by: Jonas <jonas@freesources.org>
Assisted-by: ClaudeCode:claude-opus-5-5
@mejo-
mejo- force-pushed the backport/9388/stable33 branch from 45a101b to d983113 Compare October 15, 2026 18:24
@mejo-
mejo- disabled auto-merge October 15, 2026 18:46
@mejo-
mejo- merged commit 3780de8 into stable33 Oct 15, 2026
70 of 74 checks passed
@mejo-
mejo- deleted the backport/9388/stable33 branch October 15, 2026 18:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant