Skip to content
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.

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

fix: apostrophe issue #10614

Merged
merged 1 commit into from
Jan 30, 2025
Merged

fix: apostrophe issue #10614

merged 1 commit into from
Jan 30, 2025

Conversation

SebastianKrupinski
Copy link
Contributor

@SebastianKrupinski SebastianKrupinski commented Jan 28, 2025

Fix #10534

Fixes and issue with apostrophes in system name

image

@@ -37,7 +37,7 @@ export default {

computed: {
welcomeMessage() {
return t('mail', 'Welcome to {cloudName} Mail', { cloudName: window?.OC?.theme?.name ?? 'Nextcloud' })
return t('mail', 'Welcome to {cloudName} Mail', { cloudName: window?.OC?.theme?.name ?? 'Nextcloud' }, null, {escape: false})
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

<h1 class="empty-content__name">
{{ welcomeMessage }}
</h1>
puts welcomeMessage into the DOM as-is. Doesn't that open the door for code injection?
Is window?.OC?.theme?.name HTML encoded already?!

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

window?.OC?.theme?.name is not HTML encoded, the encoding happens in the translation function.

Made changes, what do you think?

Signed-off-by: SebastianKrupinski <[email protected]>
@SebastianKrupinski
Copy link
Contributor Author

/backport to stable4.2

@SebastianKrupinski SebastianKrupinski merged commit bc4c454 into main Jan 30, 2025
34 checks passed
@SebastianKrupinski SebastianKrupinski deleted the fix/noid-apostrophe branch January 30, 2025 13:38
@SebastianKrupinski
Copy link
Contributor Author

/backport to stable3.7

@SebastianKrupinski
Copy link
Contributor Author

/backport to stable4.1

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Status: ☑️ Done
Development

Successfully merging this pull request may close these issues.

Aphistrophe not working in welcome screen
2 participants