aboutsummaryrefslogtreecommitdiffstats
path: root/actionview/lib/action_view/renderer
diff options
context:
space:
mode:
authorkennyj <kennyj@gmail.com>2013-07-15 02:11:43 +0900
committerkennyj <kennyj@gmail.com>2013-07-15 02:11:43 +0900
commitca85caca0dd10f4e4950173094f8a0577cfe2560 (patch)
tree1a94bacea79fe119724dddf0508fd8ce4360ab1d /actionview/lib/action_view/renderer
parent9fbdd9d83e8e2775845cbc581e0c357f99d292e4 (diff)
downloadrails-ca85caca0dd10f4e4950173094f8a0577cfe2560.tar.gz
rails-ca85caca0dd10f4e4950173094f8a0577cfe2560.tar.bz2
rails-ca85caca0dd10f4e4950173094f8a0577cfe2560.zip
Fix default rendered format problem when calling render method without :content_type option. Closes #11393.
Diffstat (limited to 'actionview/lib/action_view/renderer')
-rw-r--r--actionview/lib/action_view/renderer/template_renderer.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionview/lib/action_view/renderer/template_renderer.rb b/actionview/lib/action_view/renderer/template_renderer.rb
index 4d5c5db80c..668831dff3 100644
--- a/actionview/lib/action_view/renderer/template_renderer.rb
+++ b/actionview/lib/action_view/renderer/template_renderer.rb
@@ -11,7 +11,7 @@ module ActionView
prepend_formats(template.formats)
unless context.rendered_format
- context.rendered_format = template.formats.first || formats.last
+ context.rendered_format = template.formats.first || formats.first
end
render_template(template, options[:layout], options[:locals])