From 68abd9c135b0968a2ca54200754568492a9c6179 Mon Sep 17 00:00:00 2001
From: Mike Angell <mike.angell@shopify.com>
Date: Wed, 25 Sep 2019 23:57:55 +1000
Subject: [PATCH] Switch disabled? to not mutate output

---
 lib/liquid/block_body.rb | 5 ++++-
 lib/liquid/tag.rb        | 6 ++----
 lib/liquid/variable.rb   | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/lib/liquid/block_body.rb b/lib/liquid/block_body.rb
index 3d22736f..f1305ae6 100644
--- a/lib/liquid/block_body.rb
+++ b/lib/liquid/block_body.rb
@@ -154,7 +154,10 @@ module Liquid
     private
 
     def render_node(context, output, node)
-      return if node.disabled?(context, output)
+      if node.disabled?(context)
+        output << node.disabled_error_message
+        return
+      end
       disable_tags(context, node.disabled_tags) do
         node.render_to_output_buffer(context, output)
       end
diff --git a/lib/liquid/tag.rb b/lib/liquid/tag.rb
index 5e7cfde1..832e32c7 100644
--- a/lib/liquid/tag.rb
+++ b/lib/liquid/tag.rb
@@ -46,10 +46,8 @@ module Liquid
       ''
     end
 
-    def disabled?(context, output)
-      if context.registers['disabled_tags'].disabled?(tag_name)
-        output << disabled_error_message
-      end
+    def disabled?(context)
+      context.registers['disabled_tags'].disabled?(tag_name)
     end
 
     def disabled_error_message
diff --git a/lib/liquid/variable.rb b/lib/liquid/variable.rb
index a986d8d2..5b686e2d 100644
--- a/lib/liquid/variable.rb
+++ b/lib/liquid/variable.rb
@@ -104,7 +104,7 @@ module Liquid
       output
     end
 
-    def disabled?(_context, _output)
+    def disabled?(_context)
       false
     end