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

Do not escape display name in dashboard welcome text #27912

Merged
merged 1 commit into from
Jul 13, 2021

Conversation

julien-nc
Copy link
Member

@julien-nc julien-nc commented Jul 11, 2021

fixes #26113

There we go. Using translation functions correctly is better than manually processing the display name like in #26245 😁.

This can be backported to stable21 and stable22. Fix is slightly different for stable20.

@julien-nc
Copy link
Member Author

/compile amend /

Signed-off-by: Julien Veyssier <eneiluj@posteo.net>
Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
@npmbuildbot-nextcloud npmbuildbot-nextcloud bot force-pushed the fix/26113/dashboard-escaped-display-name branch from 1716d52 to 984f390 Compare July 11, 2021 16:17
@szaimen
Copy link
Contributor

szaimen commented Jul 11, 2021

/backport to stable21

@szaimen
Copy link
Contributor

szaimen commented Jul 11, 2021

/backport to stable22

@@ -180,20 +180,20 @@ export default {
const good = {
morning: {
generic: t('dashboard', 'Good morning'),
withName: t('dashboard', 'Good morning, {name}', { name: this.displayName }),
withName: t('dashboard', 'Good morning, {name}', { name: this.displayName }, undefined, { 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.

For reference, this is fine here as the text is only used in the template where it would be escaped by vue.js itself. https://vuejs.org/v2/guide/security.html#HTML-content

@julien-nc julien-nc requested a review from marcoambrosini July 12, 2021 10:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
4. to release Ready to be released and/or waiting for tests to finish enhancement feature: dashboard
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Very annoying welcome message issue with data-user-displayname
3 participants