diff --git a/ext/liquid_c/context.h b/ext/liquid_c/context.h index 8cd43d90..f251e71e 100644 --- a/ext/liquid_c/context.h +++ b/ext/liquid_c/context.h @@ -44,12 +44,15 @@ inline static VALUE value_to_liquid_and_set_context(VALUE value, VALUE context_t if (klass == rb_cString || klass == rb_cArray || klass == rb_cHash) return value; - value = rb_funcall(value, id_to_liquid, 0); + if (rb_respond_to(value, rb_intern("context="))) + rb_funcall(value, rb_intern("context="), 1, context_to_set); - if (rb_respond_to(value, id_set_context)) - rb_funcall(value, id_set_context, 1, context_to_set); + VALUE liquid_value = rb_funcall(value, id_to_liquid, 0); - return value; + if (value != liquid_value && rb_respond_to(liquid_value, id_set_context)) + rb_funcall(liquid_value, id_set_context, 1, context_to_set); + + return liquid_value; }