Merge pull request #623 from atian25/filters-escape

filter.escape should not escape SafeString, close #618
mozilla · Jan 6, 2016 · d0a7e11 · d0a7e11
2 parents 4595c69 + 05e8ff7
commit d0a7e11
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@ Changelog
 
 master (unreleased)
 -------------------
+* Fix: [Breaking Change] filter.escape should not escape SafeString(#168).
 
 v2.2.0 (Nov 23 2015)
 --------------------

diff --git a/src/filters.js b/src/filters.js
@@ -116,8 +116,7 @@ var filters = {
     },
 
     escape: function(str) {
-        if(typeof str === 'string' ||
-           str instanceof r.SafeString) {
+        if(typeof str === 'string') {
             return lib.escape(str);
         }
         return str;

diff --git a/tests/filters.js b/tests/filters.js
@@ -91,6 +91,12 @@
             finish(done);
         });
 
+        it('escape skip safe', function(done) {
+            var res = render('{{ "<html>" | safe | escape }}', {}, { autoescape: false });
+            expect(res).to.be('<html>');
+            finish(done);
+        });
+
         it('dictsort', function(done) {
             // no real foolproof way to test that a js obj has been transformed
             // from unsorted -> sorted, as its enumeration ordering is undefined
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,6 +3,7 @@ Changelog @@
     master (unreleased)
     -------------------
+    * Fix: [Breaking Change] filter.escape should not escape SafeString(#168).
     v2.2.0 (Nov 23 2015)
     --------------------
@@ Expand Down @@