Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
  • Loading branch information
amatsuda committed Jun 15, 2019
1 parent e919a00 commit c8a8460
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions actionview/lib/action_view/template/resolver.rb
Original file line number Diff line number Diff line change
Expand Up @@ -279,12 +279,8 @@ def extract_handler_and_format_and_variant(path)
format, variant = pieces.last.split(EXTENSIONS[:variants], 2) if pieces.last
format = if format
Template::Types[format]&.ref
else
if handler.respond_to?(:default_format) # default_format can return nil
handler.default_format
else
nil
end
elsif handler.respond_to?(:default_format) # default_format can return nil
handler.default_format
end

# Template::Types[format] and handler.default_format can return nil
Expand Down

0 comments on commit c8a8460

Please sign in to comment.