From 060836fd5e2e562f4a49af1230f41cec01ac02ce Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Thu, 7 Mar 2024 11:12:14 -0500 Subject: [PATCH] Revert "contextualize value before invoking to_liquid" This reverts commit ceec9cd4a41cd79eb36615daa0bbd317ffea5fbc. This is causing test failures. --- ext/liquid_c/context.h | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/ext/liquid_c/context.h b/ext/liquid_c/context.h index e810ee37..8cd43d90 100644 --- a/ext/liquid_c/context.h +++ b/ext/liquid_c/context.h @@ -44,16 +44,12 @@ 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; - // set value's context before invoking #to_liquid + value = rb_funcall(value, id_to_liquid, 0); + 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); - - if (liquid_value != value && rb_respond_to(liquid_value, id_set_context)) - rb_funcall(liquid_value, id_set_context, 1, context_to_set); - - return liquid_value; + return value; }