Merge pull request #623 from atian25/filters-escape

filter.escape should not escape SafeString, close #618
mozilla · Mar 17, 2016 · 5b0a0bd · 5b0a0bd
1 parent c1ad297
commit 5b0a0bd
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -20,6 +20,7 @@ Changelog
 
 2.4.0 (Mar 10 2016)
 -------------------
+* Fix: [Breaking Change] filter.escape should not escape SafeString(#168).
 
 * Allow retrieving boolean-false as a global. Thanks Marius Büscher. Merge of
   [#694](https://github.com/mozilla/nunjucks/pull/694).

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
@@ -92,6 +92,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