aboutsummaryrefslogtreecommitdiffstats
path: root/actionview/lib/action_view/rendering.rb
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2015-08-26 14:04:04 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2015-08-26 14:04:04 -0700
commit2ceb16e539d13bb0f130dddd630776ea13ee9597 (patch)
tree41d2eac5ac2307e1a316042f40856515d5994e07 /actionview/lib/action_view/rendering.rb
parentfa09bf44db5592d003a59729cf3089b8630e8de6 (diff)
downloadrails-2ceb16e539d13bb0f130dddd630776ea13ee9597.tar.gz
rails-2ceb16e539d13bb0f130dddd630776ea13ee9597.tar.bz2
rails-2ceb16e539d13bb0f130dddd630776ea13ee9597.zip
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
Diffstat (limited to 'actionview/lib/action_view/rendering.rb')
-rw-r--r--actionview/lib/action_view/rendering.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionview/lib/action_view/rendering.rb b/actionview/lib/action_view/rendering.rb
index f63c397c5b..8604637da2 100644
--- a/actionview/lib/action_view/rendering.rb
+++ b/actionview/lib/action_view/rendering.rb
@@ -104,7 +104,7 @@ module ActionView
end
# Assign the rendered format to look up context.
- def _process_format(format, plain = false) #:nodoc:
+ def _process_format(format) #:nodoc:
super
lookup_context.formats = [format.to_sym]
lookup_context.rendered_format = lookup_context.formats.first