diff options
| author | José Valim <jose.valim@gmail.com> | 2012-03-17 07:08:49 -0700 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2012-03-17 07:08:49 -0700 |
| commit | e5b46cfb6d2a4055fa25d3d3188a40cc86988b3e (patch) | |
| tree | c06ee6603c80dfdc7c5b35a0a6cd11ad800fd2ed /actionpack/lib/abstract_controller | |
| parent | e135ff1afdda064ad727691502761d7e552448a9 (diff) | |
| parent | 7130f9159146776067d334b5043b789860b92761 (diff) | |
| download | rails-e5b46cfb6d2a4055fa25d3d3188a40cc86988b3e.tar.gz rails-e5b46cfb6d2a4055fa25d3d3188a40cc86988b3e.tar.bz2 rails-e5b46cfb6d2a4055fa25d3d3188a40cc86988b3e.zip | |
Merge pull request #5480 from drogus/rendering-issues
Fix for #5440
Diffstat (limited to 'actionpack/lib/abstract_controller')
| -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 9019c07bca..f74fd6ac4a 100644 --- a/actionpack/lib/abstract_controller/rendering.rb +++ b/actionpack/lib/abstract_controller/rendering.rb @@ -106,6 +106,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 |