diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2019-02-25 11:53:55 -0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2019-02-25 12:26:25 -0800 |
| commit | 2f128a82e66f181577ff77d83d4ca02659aa8a8d (patch) | |
| tree | f41df8766f0c46a4e55f404fb8450821feafb0e2 /actionview/lib/action_view/template.rb | |
| parent | 5330a342852147ecd65a16f83bc51e688c8bb9eb (diff) | |
| download | rails-2f128a82e66f181577ff77d83d4ca02659aa8a8d.tar.gz rails-2f128a82e66f181577ff77d83d4ca02659aa8a8d.tar.bz2 rails-2f128a82e66f181577ff77d83d4ca02659aa8a8d.zip | |
Always pass a format to the ActionView::Template constructor
This means we can eliminate nil checks and remove some mutations from
the `decorate` method.
Diffstat (limited to 'actionview/lib/action_view/template.rb')
| -rw-r--r-- | actionview/lib/action_view/template.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/actionview/lib/action_view/template.rb b/actionview/lib/action_view/template.rb index 133a316405..9e8f17d746 100644 --- a/actionview/lib/action_view/template.rb +++ b/actionview/lib/action_view/template.rb @@ -128,8 +128,11 @@ module ActionView attr_reader :variable - def initialize(source, identifier, handler, details) - format = details[:format] || (handler.default_format if handler.respond_to?(:default_format)) + def initialize(source, identifier, handler, format: nil, **details) + unless format + ActiveSupport::Deprecation.warn "ActionView::Template#initialize requires a format parameter" + format = :html + end @source = source @identifier = identifier |