diff options
| author | Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | 2009-06-15 11:21:08 -0700 |
|---|---|---|
| committer | Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | 2009-06-15 11:21:08 -0700 |
| commit | 5a8a550a45c5ca7abc9785ed180d5f46189c9958 (patch) | |
| tree | 57e604e8485e34a6d7058c8f243e941d38bca949 /actionpack/lib/action_controller/base/mime_responds.rb | |
| parent | c50b03b754948b676b74c334edfb277fa45c1d14 (diff) | |
| download | rails-5a8a550a45c5ca7abc9785ed180d5f46189c9958.tar.gz rails-5a8a550a45c5ca7abc9785ed180d5f46189c9958.tar.bz2 rails-5a8a550a45c5ca7abc9785ed180d5f46189c9958.zip | |
Finish making things pass with updated internal content_type semantics
Diffstat (limited to 'actionpack/lib/action_controller/base/mime_responds.rb')
| -rw-r--r-- | actionpack/lib/action_controller/base/mime_responds.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/base/mime_responds.rb b/actionpack/lib/action_controller/base/mime_responds.rb index 3c17dda1a1..5c7218691e 100644 --- a/actionpack/lib/action_controller/base/mime_responds.rb +++ b/actionpack/lib/action_controller/base/mime_responds.rb @@ -125,7 +125,7 @@ module ActionController #:nodoc: end @controller.template.formats = [mime_type.to_sym] - @response.content_type = mime_type.to_s + @response.content_type = mime_type block_given? ? block.call : @controller.send(:render, :action => @controller.action_name) end |