Update against failed cherry-pick

This commit is contained in:
James Tucker
2013-09-07 01:42:41 +00:00
parent d4679cd550
commit 13c826933c
2 changed files with 2 additions and 2 deletions

View File

@@ -42,7 +42,7 @@ module Liquid
end
def self.create(context, filters = nil)
filters = @@filters.values + (filters || [])
filters = @@filters + (filters || [])
strainer_class_cache[filters].new(context)
end

View File

@@ -55,7 +55,7 @@ class StrainerTest < Test::Unit::TestCase
assert_kind_of Strainer, strainer
assert_kind_of a, strainer
assert_kind_of b, strainer
Strainer.send(:class_variable_get, :@@filters).values.each do |m|
Strainer.send(:class_variable_get, :@@filters).each do |m|
assert_kind_of m, strainer
end
end