Backport #4958 to 2.1 #12611
Merged
Backport #4958 to 2.1 #12611
Conversation
This file contains hidden or 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
mzeis
suggested changes
Dec 11, 2017
| @@ -8,7 +8,7 @@ | |||
|
|
|||
| ?> | |||
| <div class="block newsletter"> | |||
| <div class="title"><strong>Newsletter</strong></div> | |||
| <div class="title"><strong><?php /* @escapeNotVerified */ echo __('Newsletter') ?></strong></div> | |||
There was a problem hiding this comment.
I reached out to the core team regarding using @escapeNotVerified in backports because it wasn't defined how to handle this.
They asked us to not use @escapeNotVerified for new code, even in 2.1-develop abd when other strings in the same template use the same technique because we know by now that this potentially unsecure.
If you adjust your PR to escape the string (like in 2.2-develop) though, I can approve your PR!
|
Hi @slackerzz, thank you for your contribution! There is one small change we need you to do (please see my code review) and then I'm happy to accept your PR. |
The title string is hardcoded!
slackerzz
force-pushed
the
backport-pr4958
branch
from
68cbbd6 to
5158a78
Compare
|
Hi @mzeis, I've just pushed the correction |
mzeis
approved these changes
Dec 13, 2017
|
Hi @slackerzz, thanks again! Your contribution will be merged into the mainline. |
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.
Backport of #4958 to 2.1
Description
Fixed Issues (if relevant)
Manual testing scenarios
Contribution checklist