1 files changed, 10 insertions, 31 deletions
diff --git a/actionview/lib/action_view/rendering.rb b/actionview/lib/action_view/rendering.rb
index db9c4ef501..18a0788f8e 100644
--- a/actionview/lib/action_view/rendering.rb
+++ b/actionview/lib/action_view/rendering.rb
@@ -77,27 +77,6 @@ module ActionView
       @_view_renderer ||= ActionView::Renderer.new(lookup_context)
     end
 
-    # Render template to response_body
-    # :api: public
-    def render(*args, &block)
-      options = _normalize_render(*args, &block)
-      self.response_body = render_to_body(options)
-    end
-
-    # Raw rendering of a template to a string.
-    # :api: public
-    def render_to_string(*args, &block)
-      options = _normalize_render(*args, &block)
-      render_to_body(options)
-    end
-
-    # Raw rendering of a template.
-    # :api: public
-    def render_to_body(options = {})
-      _process_options(options)
-      _render_template(options)
-    end
-
     # Find and renders a template based on the options given.
     # :api: private
     def _render_template(options) #:nodoc:
@@ -105,22 +84,22 @@ module ActionView
       view_renderer.render(view_context, options)
     end
 
-    def rendered_format
-      Mime[lookup_context.rendered_format]
+    def render_to_body(options = {})
+      _process_options(options)
+      _render_template(options)
     end
 
-    def default_protected_instance_vars
-      super.concat([:@_view_context_class, :@_view_renderer, :@_lookup_context])
+    def rendered_format
+      Mime[lookup_context.rendered_format]
     end
 
     private
 
-      # Normalize args and options.
-      # :api: private
-      def _normalize_render(*args, &block)
-        options = _normalize_args(*args, &block)
-        _normalize_options(options)
-        options
+      # Assign the rendered format to lookup context.
+      def _process_format(format) #:nodoc:
+        super
+        lookup_context.formats = [format.to_sym]
+        lookup_context.rendered_format = lookup_context.formats.first
       end
 
       # Normalize args by converting render "foo" to render :action => "foo" and