diff options
| author | José Valim <jose.valim@gmail.com> | 2010-03-12 20:39:53 +0100 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-03-12 20:39:53 +0100 |
| commit | f2c0a353aef41a6df2de8e1fe3eaa3d8bbd8a6dd (patch) | |
| tree | a854e0b7b79968f7f7cdfb57d29fd6644805c5ae /actionpack/lib/action_controller/metal/mime_responds.rb | |
| parent | 2a12686832fbcf0566454904a5d733998506bf56 (diff) | |
| download | rails-f2c0a353aef41a6df2de8e1fe3eaa3d8bbd8a6dd.tar.gz rails-f2c0a353aef41a6df2de8e1fe3eaa3d8bbd8a6dd.tar.bz2 rails-f2c0a353aef41a6df2de8e1fe3eaa3d8bbd8a6dd.zip | |
Finish cleaning up rendering stack from views and move assigns evaluation to controller (so plugins and/or controllers can overwrite just one method).
Diffstat (limited to 'actionpack/lib/action_controller/metal/mime_responds.rb')
| -rw-r--r-- | actionpack/lib/action_controller/metal/mime_responds.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/metal/mime_responds.rb b/actionpack/lib/action_controller/metal/mime_responds.rb index e70a20b2be..2ac199265d 100644 --- a/actionpack/lib/action_controller/metal/mime_responds.rb +++ b/actionpack/lib/action_controller/metal/mime_responds.rb @@ -261,6 +261,7 @@ module ActionController #:nodoc: block.call(collector) if block_given? if format = request.negotiate_mime(collector.order) + self.content_type ||= format.to_s self.formats = [format.to_sym] collector.response_for(format) else |