1 files changed, 16 insertions, 7 deletions
diff --git a/actionpack/lib/action_controller/metal/rendering.rb b/actionpack/lib/action_controller/metal/rendering.rb
index c8934b367f..1ecccf9864 100644
--- a/actionpack/lib/action_controller/metal/rendering.rb
+++ b/actionpack/lib/action_controller/metal/rendering.rb
@@ -11,10 +11,17 @@ module ActionController
       # Documentation at ActionController::Renderer#render
       delegate :render, to: :renderer
 
-      # Returns a renderer class (inherited from ActionController::Renderer)
+      # Returns a renderer instance (inherited from ActionController::Renderer)
       # for the controller.
-      def renderer
-        @renderer ||= Renderer.for(self)
+      attr_reader :renderer
+
+      def setup_renderer! # :nodoc:
+        @renderer = Renderer.for(self)
+      end
+
+      def inherited(klass)
+        klass.setup_renderer!
+        super
       end
     end
 
@@ -56,12 +63,14 @@ module ActionController
       nil
     end
 
-    def _get_content_type(rendered_format)
-      self.content_type || super
+    def _set_html_content_type
+      self.content_type = Mime::Type[:HTML].to_s
     end
 
-    def _set_content_type(format)
-      self.content_type = format
+    def _set_rendered_content_type(format)
+      unless response.content_type
+        self.content_type = format.to_s
+      end
     end
 
     # Normalize arguments by catching blocks and setting them on :update.