From ec5c946138f63dc975341d6521587adc74f6b441 Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Wed, 16 Jan 2019 17:35:01 -0800 Subject: [PATCH] Pull buffer assignment up Since everything goes through a `run` method, we can pull the buffer assignment up. --- actionview/lib/action_view/base.rb | 1 + actionview/lib/action_view/template/handlers/erb/erubi.rb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/actionview/lib/action_view/base.rb b/actionview/lib/action_view/base.rb index 4318791760691..d86dd0b6c4195 100644 --- 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 index d0e87e6e7fc3e..e155bae89de27 100644 --- 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] = ""