3 files changed, 13 insertions, 9 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index df416908f0..4b2c00c86a 100644
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -3,7 +3,7 @@ require "action_controller/metal/params_wrapper"
 
 module ActionController
   # The <tt>metal</tt> anonymous class was introduced to solve issue with including modules in <tt>ActionController::Base</tt>.
-  # Modules needes to be included in particluar order. First wee need to have <tt>AbstractController::Rendering</tt> included,
+  # Modules needes to be included in particluar order. First we need to have <tt>AbstractController::Rendering</tt> included,
   # next we should include actuall implementation which would be for example <tt>ActionView::Rendering</tt> and after that
   # <tt>ActionController::Rendering</tt>. This order must be preserved and as we want to have middle module included dynamicaly
   # <tt>metal</tt> class was introduced. It has <tt>AbstractController::Rendering</tt> included and is parent class of
@@ -14,7 +14,6 @@ module ActionController
   #
   metal = Class.new(Metal) do
     include AbstractController::Rendering
-    include AbstractController::BasicRendering
   end
 
   # Action Controllers are the core of a web request in \Rails. They are made up of one or more actions that are executed
diff --git a/actionpack/lib/action_controller/metal/mime_responds.rb b/actionpack/lib/action_controller/metal/mime_responds.rb
index 834d44f045..66dabd821f 100644
--- a/actionpack/lib/action_controller/metal/mime_responds.rb
+++ b/actionpack/lib/action_controller/metal/mime_responds.rb
@@ -364,9 +364,7 @@ module ActionController #:nodoc:
       format = collector.negotiate_format(request)
 
       if format
-        self.content_type ||= format.to_s
-        lookup_context.formats = [format.to_sym]
-        lookup_context.rendered_format = lookup_context.formats.first
+        _process_format(format)
         collector
       else
         raise ActionController::UnknownFormat
diff --git a/actionpack/lib/action_controller/metal/rendering.rb b/actionpack/lib/action_controller/metal/rendering.rb
index 7b4f1f73a5..90f0ef0b1c 100644
--- a/actionpack/lib/action_controller/metal/rendering.rb
+++ b/actionpack/lib/action_controller/metal/rendering.rb
@@ -12,8 +12,6 @@ module ActionController
     def render(*args) #:nodoc:
       raise ::AbstractController::DoubleRenderError if self.response_body
       super
-      self.content_type ||= rendered_format.to_s
-      self.response_body
     end
 
     # Overwrite render_to_string because body can now be set to a rack body.
@@ -28,12 +26,21 @@ module ActionController
       end
     end
 
-    def render_to_body(*)
-      super || " "
+    def render_to_body(options = {})
+      super || if options[:text].present?
+        options[:text]
+      else
+        " "
+      end
     end
 
     private
 
+    def _process_format(format)
+      super
+      self.content_type ||= format.to_s
+    end
+
     # Normalize arguments by catching blocks and setting them on :update.
     def _normalize_args(action=nil, options={}, &blk) #:nodoc:
       options = super