From 62cb3ee35c5c0d729c54b057c37b8f6bed4dda7f Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Fri, 22 Feb 2019 11:58:04 -0800 Subject: Ensure that rendered templates always have a format This removes one call to `lookup_context` and also eliminates a conditional in `_render_template`. --- actionview/lib/action_view/renderer/template_renderer.rb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'actionview/lib/action_view/renderer/template_renderer.rb') diff --git a/actionview/lib/action_view/renderer/template_renderer.rb b/actionview/lib/action_view/renderer/template_renderer.rb index c17d6182e8..5bd14af128 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] -- cgit v1.2.3