Make sure the context gets set

This commit is contained in:
Daniel Huckstep
2013-06-06 10:19:20 -06:00
parent ba5e65f685
commit 076ae903c0
2 changed files with 11 additions and 2 deletions
+5 -2
View File
@@ -93,8 +93,11 @@ module Liquid
context = case args.first
when Liquid::Context
args.shift
when Hash, Liquid::Drop
Context.new([args.shift, assigns], instance_assigns, registers, @rethrow_errors, @resource_limits)
when Liquid::Drop
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)
when nil
Context.new(assigns, instance_assigns, registers, @rethrow_errors, @resource_limits)
else