diff options
author | Dmitry Vorotilin <d.vorotilin@gmail.com> | 2012-07-11 12:18:52 +0400 |
---|---|---|
committer | Steve Klabnik <steve@steveklabnik.com> | 2013-04-02 10:36:23 -0700 |
commit | 2c22376fe04b89e8f34620139720b85a85ce3428 (patch) | |
tree | bda9c828cf2f7519a48e655b00b813543592d1ed /actionpack/lib/action_view/renderer/template_renderer.rb | |
parent | 060fca78970e54b6400296325a212632de727b21 (diff) | |
download | rails-2c22376fe04b89e8f34620139720b85a85ce3428.tar.gz rails-2c22376fe04b89e8f34620139720b85a85ce3428.tar.bz2 rails-2c22376fe04b89e8f34620139720b85a85ce3428.zip |
Common behavior with adding formats to lookup_context for TemplateRenderer and PartialRenderer
Diffstat (limited to 'actionpack/lib/action_view/renderer/template_renderer.rb')
-rw-r--r-- | actionpack/lib/action_view/renderer/template_renderer.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/actionpack/lib/action_view/renderer/template_renderer.rb b/actionpack/lib/action_view/renderer/template_renderer.rb index a27d5dd1b1..d15e75637a 100644 --- a/actionpack/lib/action_view/renderer/template_renderer.rb +++ b/actionpack/lib/action_view/renderer/template_renderer.rb @@ -10,9 +10,10 @@ module ActionView template = determine_template(options) context = @lookup_context + prepend_formats(template.formats) + unless context.rendered_format - context.formats = template.formats unless template.formats.empty? - context.rendered_format = context.formats.first + context.rendered_format = template.formats.first || formats.last end render_template(template, options[:layout], options[:locals]) |