Pull `plain` content type handling up to `render`

`render` is the only possible source for the `plain` option.  Pulling
the conditional up to the `render` method removes far away conditionals

2 files changed, 5 insertions, 8 deletions

diff --git a/actionpack/lib/abstract_controller/rendering.rb b/actionpack/lib/abstract_controller/rendering.rb
index 854b07d707..a52aa8e874 100644
--- a/actionpack/lib/abstract_controller/rendering.rb
+++ b/actionpack/lib/abstract_controller/rendering.rb
@@ -23,7 +23,8 @@ module AbstractController
     def render(*args, &block)
       options = _normalize_render(*args, &block)
       self.response_body = render_to_body(options)
-      _process_format(rendered_format, options[:plain]) if rendered_format
+      _process_format(rendered_format) if rendered_format
+      self.content_type = Mime::TEXT if options[:plain]
       self.response_body
     end
 
@@ -99,7 +100,7 @@ module AbstractController
 
     # Process the rendered format.
     # :api: private
-    def _process_format(format, plain = false)
+    def _process_format(format)
     end
 
     # Normalize args and options.
diff --git a/actionpack/lib/action_controller/metal/rendering.rb b/actionpack/lib/action_controller/metal/rendering.rb
index 0a005085ba..a2d671486d 100644
--- a/actionpack/lib/action_controller/metal/rendering.rb
+++ b/actionpack/lib/action_controller/metal/rendering.rb
@@ -56,14 +56,10 @@ module ActionController
       nil
     end
 
-    def _process_format(format, plain = false)
+    def _process_format(format)
       super
 
-      if plain
-        self.content_type = Mime::TEXT
-      else
-        self.content_type ||= format.to_s
-      end
+      self.content_type ||= format.to_s
     end
 
     # Normalize arguments by catching blocks and setting them on :update.