diff options
| author | José Valim <jose.valim@gmail.com> | 2012-03-17 07:08:49 -0700 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2012-03-17 11:24:19 -0300 |
| commit | 39514af7e7302dd134d015158325591c1e974d35 (patch) | |
| tree | 2ce4b11917ce9256a446d95ae2e1f57462fb0fbb /actionpack/lib | |
| parent | 4711298767b3d67a15f7dadeb2d8b40bb6356ad5 (diff) | |
| download | rails-39514af7e7302dd134d015158325591c1e974d35.tar.gz rails-39514af7e7302dd134d015158325591c1e974d35.tar.bz2 rails-39514af7e7302dd134d015158325591c1e974d35.zip | |
Merge pull request #5480 from drogus/rendering-issues
Fix for #5440
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/abstract_controller/rendering.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/actionpack/lib/abstract_controller/rendering.rb b/actionpack/lib/abstract_controller/rendering.rb index ddc93464cd..7d73c6af8d 100644 --- a/actionpack/lib/abstract_controller/rendering.rb +++ b/actionpack/lib/abstract_controller/rendering.rb @@ -105,6 +105,7 @@ module AbstractController # Find and renders a template based on the options given. # :api: private def _render_template(options) #:nodoc: + lookup_context.rendered_format = nil if options[:formats] view_renderer.render(view_context, options) end |