diff options
author | Aaron Patterson <tenderlove@github.com> | 2019-02-25 14:04:10 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-02-25 14:04:10 -0800 |
commit | 56b030605b4d968077a4ddb96b4ab619e75fb999 (patch) | |
tree | 7658993bdbb1a78094d2cbe3d88691983aa88277 /actionview/lib/action_view/renderer | |
parent | 790a3e69acb2fa172c6bce45e040e9f15d9bef3d (diff) | |
parent | ca5e23ed4d8818d81314953aadd422b2cbde63b0 (diff) | |
download | rails-56b030605b4d968077a4ddb96b4ab619e75fb999.tar.gz rails-56b030605b4d968077a4ddb96b4ab619e75fb999.tar.bz2 rails-56b030605b4d968077a4ddb96b4ab619e75fb999.zip |
Merge pull request #35406 from rails/template-has-one-format
Templates have one format
Diffstat (limited to 'actionview/lib/action_view/renderer')
-rw-r--r-- | actionview/lib/action_view/renderer/abstract_renderer.rb | 2 | ||||
-rw-r--r-- | actionview/lib/action_view/renderer/template_renderer.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/actionview/lib/action_view/renderer/abstract_renderer.rb b/actionview/lib/action_view/renderer/abstract_renderer.rb index f1b4c9b92d..475452f1bb 100644 --- a/actionview/lib/action_view/renderer/abstract_renderer.rb +++ b/actionview/lib/action_view/renderer/abstract_renderer.rb @@ -68,7 +68,7 @@ module ActionView end def format - template.formats.first + template.format end EMPTY_SPACER = Struct.new(:body).new diff --git a/actionview/lib/action_view/renderer/template_renderer.rb b/actionview/lib/action_view/renderer/template_renderer.rb index 87f6cf3de3..83b990b081 100644 --- a/actionview/lib/action_view/renderer/template_renderer.rb +++ b/actionview/lib/action_view/renderer/template_renderer.rb @@ -8,7 +8,7 @@ module ActionView @details = extract_details(options) template = determine_template(options) - prepend_formats(template.formats) + prepend_formats(template.format) render_template(context, template, options[:layout], options[:locals] || {}) end |