aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/abstract_controller/rendering.rb
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack/lib/abstract_controller/rendering.rb')
-rw-r--r--actionpack/lib/abstract_controller/rendering.rb5
1 files changed, 3 insertions, 2 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.