Pull up virtual path assignment

2 files changed, 3 insertions, 5 deletions

diff --git a/actionview/lib/action_view/base.rb b/actionview/lib/action_view/base.rb
index d86dd0b6c4..f3a9b363ca 100644
--- a/actionview/lib/action_view/base.rb
+++ b/actionview/lib/action_view/base.rb
@@ -211,11 +211,11 @@ module ActionView #:nodoc:
     end
 
     def run(method, locals, buffer, &block)
-      _old_output_buffer = @output_buffer
+      _old_output_buffer, _old_virtual_path = @output_buffer, @virtual_path
       @output_buffer = buffer
       send(method, locals, buffer, &block)
     ensure
-      @output_buffer = _old_output_buffer
+      @output_buffer, @virtual_path = _old_output_buffer, _old_virtual_path
     end
 
     ActiveSupport.run_load_hooks(:action_view, self)
diff --git a/actionview/lib/action_view/template.rb b/actionview/lib/action_view/template.rb
index ed680df4c6..e86a49f222 100644
--- a/actionview/lib/action_view/template.rb
+++ b/actionview/lib/action_view/template.rb
@@ -301,9 +301,7 @@ module ActionView
         # encoding of the code
         source = +<<-end_src
           def #{method_name}(local_assigns, output_buffer)
-            _old_virtual_path, @virtual_path = @virtual_path, #{@virtual_path.inspect};#{locals_code};#{code}
-          ensure
-            @virtual_path = _old_virtual_path
+            @virtual_path = #{@virtual_path.inspect};#{locals_code};#{code}
           end
         end_src