diff options
Diffstat (limited to 'actionview')
| -rw-r--r-- | actionview/lib/action_view/template/resolver.rb | 8 | ||||
| -rw-r--r-- | actionview/test/lib/test_component.rb | 1 |
2 files changed, 2 insertions, 7 deletions
diff --git a/actionview/lib/action_view/template/resolver.rb b/actionview/lib/action_view/template/resolver.rb index ebda5a167e..bfac4c08a0 100644 --- a/actionview/lib/action_view/template/resolver.rb +++ b/actionview/lib/action_view/template/resolver.rb @@ -279,12 +279,8 @@ module ActionView 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 diff --git a/actionview/test/lib/test_component.rb b/actionview/test/lib/test_component.rb index 493b9487b1..0d45d6e25f 100644 --- a/actionview/test/lib/test_component.rb +++ b/actionview/test/lib/test_component.rb @@ -41,6 +41,5 @@ class TestComponent < ActionView::Base end private - attr_reader :content, :title, :view_context end |