Merge branch 'experimental' of git://github.com/jamesmacaulay/liquid into jamesmacaulay/experimental

Conflicts:

	lib/liquid.rb
	lib/liquid/variable.rb
This commit is contained in:
Tobias Lütke
2008-11-02 10:11:08 -08:00
13 changed files with 119 additions and 13 deletions
+1 -2
View File
@@ -21,8 +21,7 @@ module Liquid
@name = match[1]
if markup.match(/#{FilterSeparator}\s*(.*)/)
filters = Regexp.last_match(1).split(/#{FilterSeparator}/)
filters.each do |f|
filters.each do |f|
if matches = f.match(/\s*(\w+)/)
filtername = matches[1]
filterargs = f.scan(/(?:#{FilterArgumentSeparator}|#{ArgumentSeparator})\s*(#{QuotedFragment})/).flatten