diff options
| author | Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | 2009-05-21 14:22:07 -0700 |
|---|---|---|
| committer | Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | 2009-05-21 14:34:56 -0700 |
| commit | e693f45e155a81b6c337b8766870b56716a05105 (patch) | |
| tree | 176d94bdc8aa6e072666f1a1ef9383ff809a18df /actionpack/lib/action_controller/base | |
| parent | 386ff66e5ed4fbe1e060610d4226a4eb22dca766 (diff) | |
| download | rails-e693f45e155a81b6c337b8766870b56716a05105.tar.gz rails-e693f45e155a81b6c337b8766870b56716a05105.tar.bz2 rails-e693f45e155a81b6c337b8766870b56716a05105.zip | |
Remove some response content type concepts from ActionView
Diffstat (limited to 'actionpack/lib/action_controller/base')
| -rw-r--r-- | actionpack/lib/action_controller/base/mime_responds.rb | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/actionpack/lib/action_controller/base/mime_responds.rb b/actionpack/lib/action_controller/base/mime_responds.rb index e560376e0d..3c17dda1a1 100644 --- a/actionpack/lib/action_controller/base/mime_responds.rb +++ b/actionpack/lib/action_controller/base/mime_responds.rb @@ -122,12 +122,11 @@ module ActionController #:nodoc: # TODO: Remove this when new base is merged in if defined?(Http) @controller.formats = [mime_type.to_sym] - @controller.template.formats = [mime_type.to_sym] - else - @controller.template.formats = [mime_type.to_sym] - @response.content_type = mime_type.to_s end + @controller.template.formats = [mime_type.to_sym] + @response.content_type = mime_type.to_s + block_given? ? block.call : @controller.send(:render, :action => @controller.action_name) end end |