From 45795f8766b571c1107e7f4107004ce986ec4d64 Mon Sep 17 00:00:00 2001 From: Florian Weingarten Date: Wed, 11 Sep 2013 10:01:04 -0400 Subject: [PATCH] Fix handling of unknown tags in comments --- lib/liquid/tags/comment.rb | 4 +++- test/liquid/tags/standard_tag_test.rb | 6 ++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/lib/liquid/tags/comment.rb b/lib/liquid/tags/comment.rb index 1eaf71fa..94875a9e 100644 --- a/lib/liquid/tags/comment.rb +++ b/lib/liquid/tags/comment.rb @@ -1,5 +1,7 @@ +require "liquid/tags/raw" + module Liquid - class Comment < Block + class Comment < Raw def render(context) '' end diff --git a/test/liquid/tags/standard_tag_test.rb b/test/liquid/tags/standard_tag_test.rb index 4d8bdd33..a592a403 100644 --- a/test/liquid/tags/standard_tag_test.rb +++ b/test/liquid/tags/standard_tag_test.rb @@ -34,6 +34,12 @@ class StandardTagTest < Test::Unit::TestCase assert_template_result('','{%comment%}comment{%endcomment%}') assert_template_result('','{% comment %}comment{% endcomment %}') + assert_template_result('','{%comment%}{%blabla%}{%endcomment%}') + assert_template_result('','{% comment %}{% blabla %}{% endcomment %}') + assert_template_result('','{%comment%}{% endif %}{%endcomment%}') + assert_template_result('','{% comment %}{% endwhatever %}{% endcomment %}') + assert_template_result('','{% comment %} {{ %} {{%%%}} {% endcomment {% endcomment %}') + assert_template_result('foobar','foo{%comment%}comment{%endcomment%}bar') assert_template_result('foobar','foo{% comment %}comment{% endcomment %}bar') assert_template_result('foobar','foo{%comment%} comment {%endcomment%}bar')