From 13c826933c0c0a7cfe48e8731fc93dc594507561 Mon Sep 17 00:00:00 2001 From: James Tucker Date: Sat, 7 Sep 2013 01:42:41 +0000 Subject: [PATCH] Update against failed cherry-pick --- lib/liquid/strainer.rb | 2 +- test/liquid/strainer_test.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/liquid/strainer.rb b/lib/liquid/strainer.rb index 0aa3035..f5d525d 100644 --- a/lib/liquid/strainer.rb +++ b/lib/liquid/strainer.rb @@ -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 diff --git a/test/liquid/strainer_test.rb b/test/liquid/strainer_test.rb index 6bcbe29..b7ec593 100644 --- a/test/liquid/strainer_test.rb +++ b/test/liquid/strainer_test.rb @@ -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