Fix rebase issues

Shopify · Jan 11, 2021 · 5b1f9d8 · 5b1f9d8
1 parent dd35354
commit 5b1f9d8
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/ext/liquid_c/block.c b/ext/liquid_c/block.c
@@ -401,18 +401,14 @@ static VALUE block_body_parse_from_source(VALUE self, block_body_t *body, VALUE
         markup = tag_markup_get_markup(unknown_tag);
         block_body_push_tag_markup(body, parse_context_obj, unknown_tag);
 
-        if (RTEST(parse_context.parent_tag)) {
+        if (RTEST(parse_context.parent_tag) && !body->as.intermediate.bound_to_tag) {
+            body->as.intermediate.bound_to_tag = true;
             tag_markup_set_block_body(parse_context.parent_tag, self, body);
         }
     }
 
     VALUE block_ret = rb_yield_values(2, tag_name, markup);
 
-    if (RTEST(parse_context.parent_tag) && !body->as.intermediate.bound_to_tag) {
-        body->as.intermediate.bound_to_tag = true;
-        tag_markup_set_block_body(parse_context.parent_tag, self, body);
-    }
-
     return block_ret;
 }