diff options
author | Aaron Patterson <aaron.patterson@gmail.com> | 2019-02-22 11:58:04 -0800 |
---|---|---|
committer | Aaron Patterson <aaron.patterson@gmail.com> | 2019-02-22 11:58:04 -0800 |
commit | 62cb3ee35c5c0d729c54b057c37b8f6bed4dda7f (patch) | |
tree | bf6227cab8ce3e46aad24bb383eb37044625a0b2 /actionview/lib/action_view/rendering.rb | |
parent | 3b6602aa7a01fb415fce07ef32458b131e5762e1 (diff) | |
download | rails-62cb3ee35c5c0d729c54b057c37b8f6bed4dda7f.tar.gz rails-62cb3ee35c5c0d729c54b057c37b8f6bed4dda7f.tar.bz2 rails-62cb3ee35c5c0d729c54b057c37b8f6bed4dda7f.zip |
Ensure that rendered templates always have a format
This removes one call to `lookup_context` and also eliminates a
conditional in `_render_template`.
Diffstat (limited to 'actionview/lib/action_view/rendering.rb')
-rw-r--r-- | actionview/lib/action_view/rendering.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/actionview/lib/action_view/rendering.rb b/actionview/lib/action_view/rendering.rb index ac861c44d4..e5e2771323 100644 --- a/actionview/lib/action_view/rendering.rb +++ b/actionview/lib/action_view/rendering.rb @@ -118,8 +118,7 @@ module ActionView renderer.render_to_object(context, options) end - rendered_format = rendered_template.format || lookup_context.formats.first - @rendered_format = Template::Types[rendered_format] + @rendered_format = Template::Types[rendered_template.format] rendered_template.body end |