Pull buffer assignment up

Since everything goes through a `run` method, we can pull the buffer assignment up.
rails · Jan 17, 2019 · ec5c946 · ec5c946
1 parent c740ebd
commit ec5c946
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/actionview/lib/action_view/base.rb b/actionview/lib/action_view/base.rb
@@ -212,6 +212,7 @@ def initialize(context = nil, assigns = {}, controller = nil, formats = nil) #:n
 
     def run(method, locals, buffer, &block)
       _old_output_buffer = @output_buffer
+      @output_buffer = buffer
       send(method, locals, buffer, &block)
     ensure
       @output_buffer = _old_output_buffer

diff --git a/actionview/lib/action_view/template/handlers/erb/erubi.rb b/actionview/lib/action_view/template/handlers/erb/erubi.rb
@@ -13,7 +13,7 @@ def initialize(input, properties = {})
 
             # Dup properties so that we don't modify argument
             properties = Hash[properties]
-            properties[:preamble]   = "@output_buffer = output_buffer;"
+            properties[:preamble]   = ""
             properties[:postamble]  = "@output_buffer.to_s"
             properties[:bufvar]     = "@output_buffer"
             properties[:escapefunc] = ""