1 files changed, 8 insertions, 2 deletions
diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb
index e19acc5c29..3bbd2ca530 100644
--- a/actionpack/lib/action_view/base.rb
+++ b/actionpack/lib/action_view/base.rb
@@ -288,12 +288,12 @@ module ActionView #:nodoc:
     # Access the current template being rendered.
     # Returns a ActionView::Template object.
     def template
-      @_current_render
+      Thread.current[:_current_render]
     end
 
     def template=(template) #:nodoc:
       @_first_render ||= template
-      @_current_render = template
+      Thread.current[:_current_render] = template
     end
 
     def with_template(current_template)
@@ -303,6 +303,12 @@ module ActionView #:nodoc:
       self.template = last_template
     end
 
+    def punctuate_body!(part)
+      flush_output_buffer
+      response.body_parts << part
+      nil
+    end
+
     private
       # Evaluates the local assigns and controller ivars, pushes them to the view.
       def _evaluate_assigns_and_ivars #:nodoc: