filter.escape should not escape SafeString, close #618 #623
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
|
rebase done. |
| @@ -117,7 +117,7 @@ var filters = { | |||
|
|
|||
| escape: function(str) { | |||
| if(typeof str === 'string' || | |||
| str instanceof r.SafeString) { | |||
| str instanceof r.SafeString === false) { | |||
There was a problem hiding this comment.
This definitely doesn't look right; it would cause this filter to attempt to escape any object which is not a SafeString. I think instead the entire conditional can be simplified to just if(typeof str === 'string') removing the || entirely.
|
Thanks for the PR! Normally we don't compile the browser versions for every single change -- that just dramatically increases the likelihood of conflicts between pull requests. Can you update this PR to just add the test and change the source, but not include the compiled files? Also, please add a note in the changelog about this change. It's backwards-incompatible, so I think it'll need to go into v3. |
|
@carljm thanks for review, had update. |
carljm
added a commit
that referenced
this pull request
Jan 6, 2016
filter.escape should not escape SafeString, close #618
|
Merged, thanks! |
carljm
added a commit
that referenced
this pull request
Mar 17, 2016
filter.escape should not escape SafeString, close #618
carljm
added a commit
that referenced
this pull request
Mar 17, 2016
* 2.x: Bump version to 2.5.0-dev.2. Update version in Changelog, too. Release 2.4.1. Backport not escaping SafeString; it's a bug. Update changelog. Merge pull request #701 from legutierr/master Merge pull request #623 from atian25/filters-escape Throw an error if a block is defined multiple times. Refs #696. Update changelog. Grammar fixes. Merge pull request #691 from dkebler/file-ext Update changelog. Merge branch 't576'
Closed
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.