diff options
author | Aaron Patterson <tenderlove@github.com> | 2019-02-22 12:48:45 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-02-22 12:48:45 -0800 |
commit | a342d97d576b5b3f0b31155c019006ff59ea76a3 (patch) | |
tree | 732f10f924f2925a5fa235836f19f28e12120982 /actionview/lib/action_view/renderer/template_renderer.rb | |
parent | fcbf5f4003bf9ea029b0a27fb983d17601c49b23 (diff) | |
parent | 62cb3ee35c5c0d729c54b057c37b8f6bed4dda7f (diff) | |
download | rails-a342d97d576b5b3f0b31155c019006ff59ea76a3.tar.gz rails-a342d97d576b5b3f0b31155c019006ff59ea76a3.tar.bz2 rails-a342d97d576b5b3f0b31155c019006ff59ea76a3.zip |
Merge pull request #35371 from rails/always-have-a-format
Ensure that rendered templates always have a format
Diffstat (limited to 'actionview/lib/action_view/renderer/template_renderer.rb')
-rw-r--r-- | actionview/lib/action_view/renderer/template_renderer.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/actionview/lib/action_view/renderer/template_renderer.rb b/actionview/lib/action_view/renderer/template_renderer.rb index b6861d49fe..a129ef0e15 100644 --- a/actionview/lib/action_view/renderer/template_renderer.rb +++ b/actionview/lib/action_view/renderer/template_renderer.rb @@ -29,7 +29,12 @@ module ActionView @lookup_context.with_fallbacks.find_file(options[:file], nil, false, keys, @details) elsif options.key?(:inline) handler = Template.handler_for_extension(options[:type] || "erb") - Template.new(options[:inline], "inline template", handler, locals: keys) + format = if handler.respond_to?(:default_format) + handler.default_format + else + @lookup_context.formats.first + end + Template.new(options[:inline], "inline template", handler, locals: keys, format: format) elsif options.key?(:template) if options[:template].respond_to?(:render) options[:template] |