Do not escape display name in dashboard welcome text #27912
Merged
Conversation
This file contains 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
julien-nc
requested review from
ChristophWurst,
juliusknorr,
skjnldsv and
szaimen
This was referenced Jul 11, 2021
|
/compile amend / |
Signed-off-by: Julien Veyssier <[email protected]> Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
npmbuildbot-nextcloud
bot
force-pushed
the
fix/26113/dashboard-escaped-display-name
branch
from
1716d52 to
984f390
Compare
|
/backport to stable21 |
|
/backport to stable22 |
juliusknorr
reviewed
Jul 12, 2021
| @@ -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 }), | |||
There was a problem hiding this comment.
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
juliusknorr
approved these changes
Jul 12, 2021
szaimen
approved these changes
Jul 13, 2021
szaimen
added
4. to release
This was referenced Jul 13, 2021
This was referenced Jul 14, 2021
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.
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
stable21andstable22. Fix is slightly different forstable20.