Labyricorn/liquid
1
0
Fork 0
mirror of https://github.com/Shopify/liquid.git synced 2026-09-17 01:40:42 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into dont_render_blank_blocks

Browse Source 
Conflicts:
	lib/liquid/tag.rb
This commit is contained in:
Florian Weingarten
2013-07-02 14:00:30 -04:00
parent b53601100f 5c5e7de31e
commit cd3f976288
7 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/liquid/block.rb
+3 -3
View File
@@ -19,7 +19,7 @@ module Liquid
when IsTag
if token =~ FullToken
# if we found the proper block delimitor just end parsing here and let the outer block
# if we found the proper block delimiter just end parsing here and let the outer block
# proceed
if block_delimiter == $1
end_tag
@@ -50,8 +50,8 @@ module Liquid
end
end
# Make sure that its ok to end parsing in the current block.
# Effectively this method will throw and exception unless the current block is
# Make sure that it's ok to end parsing in the current block.
# Effectively this method will throw an exception unless the current block is
# of type Document
assert_missing_delimitation!
end