Tweaks to escaping strategy in a couple places #13500
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
diosmosis
added
the
not-in-changelog
sgiehl
reviewed
Sep 30, 2018
There was a problem hiding this comment.
Locally the encoding in site selector looks fine when creating a site with special chars in the name. But the UI tests shows the values encoded. See https://builds-artifacts.matomo.org/matomo-org/matomo/email-escaping/30265/SiteSelector_loaded.png
| @@ -5,7 +5,7 @@ | |||
| <span data-date="{{ date }}" data-count="{{ counts.count }}" data-starred="{{ counts.starred }}" | |||
| {% if counts.count == 0 %}title="{{ 'Annotations_AddAnnotationsFor'|translate(date) }}" | |||
| {% elseif counts.count == 1 %}title="{{ 'Annotations_AnnotationOnDate'|translate(date, | |||
| counts.note)|raw }} | |||
| counts.note)|e('html_attr') }} | |||
There was a problem hiding this comment.
Theoretically it would be enough to only escape counts.note. That would allow the translation to contain html tags (which it currently doesn't have)
|
@sgiehl Updated. EDIT: Didn't fix the test failure, just saw that. |
|
Note: this changes the expectation of input in the siteselector, it now expects un-encoded input names and will escape everything through ng-bind or |
sgiehl
force-pushed
the
email-escaping
branch
from
e9df472
to
fb5100f
Compare
sgiehl
approved these changes
Oct 11, 2018
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.
No description provided.