diff options
| author | Aaron Patterson <tenderlove@github.com> | 2019-01-22 09:28:08 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-22 09:28:08 -0800 |
| commit | db4b77aca147ec3c7376d803fc6ccb14c9195352 (patch) | |
| tree | e73fa5f4145cf294f983cb752cc49c8985616d48 /actionpack/lib/action_controller/metal/implicit_render.rb | |
| parent | e26f0658da7ff7e9382d6040fe76c087ff1791e4 (diff) | |
| parent | 0f081611e6746ebbf17ffc13e119b24c9ad7aa73 (diff) | |
| download | rails-db4b77aca147ec3c7376d803fc6ccb14c9195352.tar.gz rails-db4b77aca147ec3c7376d803fc6ccb14c9195352.tar.bz2 rails-db4b77aca147ec3c7376d803fc6ccb14c9195352.zip | |
Merge pull request #34952 from rails/template-stuff
Template Handler Refactoring
Diffstat (limited to 'actionpack/lib/action_controller/metal/implicit_render.rb')
| -rw-r--r-- | actionpack/lib/action_controller/metal/implicit_render.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/metal/implicit_render.rb b/actionpack/lib/action_controller/metal/implicit_render.rb index d3bb58f48b..8365ddca57 100644 --- a/actionpack/lib/action_controller/metal/implicit_render.rb +++ b/actionpack/lib/action_controller/metal/implicit_render.rb @@ -30,9 +30,9 @@ module ActionController # :stopdoc: include BasicImplicitRender - def default_render(*args) + def default_render if template_exists?(action_name.to_s, _prefixes, variants: request.variant) - render(*args) + render elsif any_templates?(action_name.to_s, _prefixes) message = "#{self.class.name}\##{action_name} is missing a template " \ "for this request format and variant.\n" \ |