Merge pull request #606 from tgabi333/master

RobLoach · web-flow · commit ed71272f575e · 2019-01-22T16:22:46.000-05:00
fix for not autoescaping includes having a parent
diff --git a/src/twig.core.js b/src/twig.core.js
@@ -1290,7 +1290,8 @@ module.exports = function (Twig) {
                     that.parent = ext_template;
 
                     return that.parent.renderAsync(that.context, {
-                        blocks: that.blocks
+                        blocks: that.blocks,
+                        isInclude: true
                     });
                 }
 
diff --git a/test/test.core.js b/test/test.core.js
@@ -382,6 +382,16 @@ describe("Twig.js Core ->", function() {
             }).render({ value: "&" }).should.equal('&& & &amp; & &&');
         });
 
+        it("should not autoescape includes having a parent", function() {
+            twig({id: 'included3', data: '{% extends "parent2" %}{% block body %}& {{ value }} &{% endblock %}'});
+            twig({id: 'parent2', data: '&& {% block body %}{% endblock body %} &&'});
+            twig({
+                allowInlineIncludes: true,
+                autoescape: true,
+                data: '&&& {% include "included3" %} &&&'
+            }).render({ value: "&" }).should.equal('&&& && & &amp; & && &&&');
+        });
+
         it("should support autoescape option with alternative strategy", function() {
             twig({
                 autoescape: 'js',

Original file line number	Diff line number	Diff line change
`@@ -1290,7 +1290,8 @@ module.exports = function (Twig) {`
`1290`	`1290`	`that.parent = ext_template;`
`1291`	`1291`
`1292`	`1292`	`return that.parent.renderAsync(that.context, {`
`1293`		`- blocks: that.blocks`
	`1293`	`+ blocks: that.blocks,`
	`1294`	`+ isInclude: true`
`1294`	`1295`	`});`
`1295`	`1296`	`}`
`1296`	`1297`