From f8288546f872357ff69c2ef45544fadd9280762e Mon Sep 17 00:00:00 2001 From: Daniel Huckstep Date: Thu, 6 Jun 2013 10:20:34 -0600 Subject: [PATCH] Missed in the rebase conflicts --- lib/liquid/template.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/liquid/template.rb b/lib/liquid/template.rb index a65063c..5e0675f 100644 --- a/lib/liquid/template.rb +++ b/lib/liquid/template.rb @@ -97,7 +97,7 @@ module Liquid drop = args.shift drop.context = Context.new([drop, assigns], instance_assigns, registers, @rethrow_errors, @resource_limits) when Hash - Context.new([args.shift, assigns], instance_assigns, registers, @rethrow_errors) + Context.new([args.shift, assigns], instance_assigns, registers, @rethrow_errors, @resource_limits) when nil Context.new(assigns, instance_assigns, registers, @rethrow_errors, @resource_limits) else