aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2015-08-26 13:51:28 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2015-08-26 13:51:28 -0700
commitfa09bf44db5592d003a59729cf3089b8630e8de6 (patch)
treec1d40df4d369c54669c8ef3ff5446da7d0991f16 /actionpack/lib
parentd47438745e34d75e03347b54b604b71b7a92c3ac (diff)
downloadrails-fa09bf44db5592d003a59729cf3089b8630e8de6.tar.gz
rails-fa09bf44db5592d003a59729cf3089b8630e8de6.tar.bz2
rails-fa09bf44db5592d003a59729cf3089b8630e8de6.zip
stop passing the options hash to `_process_format`
We don't need to pass the full hash just to pull one value out. It's better to just pass the value that the method needs to know about so that we can abstract it away from "options"
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/abstract_controller/rendering.rb4
-rw-r--r--actionpack/lib/action_controller/metal/rendering.rb4
2 files changed, 4 insertions, 4 deletions
diff --git a/actionpack/lib/abstract_controller/rendering.rb b/actionpack/lib/abstract_controller/rendering.rb
index 887196b3d2..854b07d707 100644
--- a/actionpack/lib/abstract_controller/rendering.rb
+++ b/actionpack/lib/abstract_controller/rendering.rb
@@ -23,7 +23,7 @@ module AbstractController
def render(*args, &block)
options = _normalize_render(*args, &block)
self.response_body = render_to_body(options)
- _process_format(rendered_format, options) if rendered_format
+ _process_format(rendered_format, options[:plain]) if rendered_format
self.response_body
end
@@ -99,7 +99,7 @@ module AbstractController
# Process the rendered format.
# :api: private
- def _process_format(format, options = {})
+ def _process_format(format, plain = false)
end
# Normalize args and options.
diff --git a/actionpack/lib/action_controller/metal/rendering.rb b/actionpack/lib/action_controller/metal/rendering.rb
index a3b0645dc0..0a005085ba 100644
--- a/actionpack/lib/action_controller/metal/rendering.rb
+++ b/actionpack/lib/action_controller/metal/rendering.rb
@@ -56,10 +56,10 @@ module ActionController
nil
end
- def _process_format(format, options = {})
+ def _process_format(format, plain = false)
super
- if options[:plain]
+ if plain
self.content_type = Mime::TEXT
else
self.content_type ||= format.to_s