Merge pull request #687 from tgabi333/master

fix autoescape for empty includes
twigjs · Dec 16, 2019 · 70c0fcd · 70c0fcd
2 parents 788437f + e8f15bd
commit 70c0fcd
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/src/twig.core.js b/src/twig.core.js
@@ -709,7 +709,12 @@ module.exports = function (Twig) {
  return '';
  }
 
- return new Twig.Markup(escapedOutput.join(''), true);
+ const joinedOutput = escapedOutput.join('');
+ if (joinedOutput.length === 0) {
+ return '';
+ }
+
+ return new Twig.Markup(joinedOutput, true);
  };
 
  // Namespace for template storage and retrieval

diff --git a/test/test.core.js b/test/test.core.js
@@ -441,6 +441,15 @@ describe('Twig.js Core ->', function () {
  }).should.equal('<p>&lt;test&gt;&amp;&lt;/test&gt;</p>');
  });
 
+ it('should autoescape handle empty include', function () {
+ twig({id: 'included-return', data: ''});
+ twig({
+ allowInlineIncludes: true,
+ autoescape: true,
+ data: '{% include "included-return" %}'
+ }).render().should.equal('');
+ })
+
  it('should use a correct context in the extended template', function () {
  twig({id: 'parent', data: '{% block body %}{{ value }}{% endblock body %}'});
  twig({