diff options
| author | José Valim <jose.valim@gmail.com> | 2009-06-19 16:10:24 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2009-06-19 16:10:24 +0200 |
| commit | 8037fee9ff1dd13c421e6689229457c1ef084074 (patch) | |
| tree | c60b2bf3e297be3e1bccb64ffd034acb137a7aa8 /actionpack/lib/action_controller/base/mime_responds.rb | |
| parent | 908b5305d4446433433313e315deb4083c58233e (diff) | |
| parent | 9f7eaea201b2f408d9effbf82f2731957e284adf (diff) | |
| download | rails-8037fee9ff1dd13c421e6689229457c1ef084074.tar.gz rails-8037fee9ff1dd13c421e6689229457c1ef084074.tar.bz2 rails-8037fee9ff1dd13c421e6689229457c1ef084074.zip | |
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'actionpack/lib/action_controller/base/mime_responds.rb')
| -rw-r--r-- | actionpack/lib/action_controller/base/mime_responds.rb | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/actionpack/lib/action_controller/base/mime_responds.rb b/actionpack/lib/action_controller/base/mime_responds.rb index c0aa58a6c2..ed0d58dba1 100644 --- a/actionpack/lib/action_controller/base/mime_responds.rb +++ b/actionpack/lib/action_controller/base/mime_responds.rb @@ -120,10 +120,7 @@ module ActionController #:nodoc: @responses[mime_type] ||= Proc.new do # TODO: Remove this when new base is merged in - if defined?(Http) - @controller.formats = [mime_type.to_sym] - end - + @controller.formats = [mime_type.to_sym] @controller.content_type = mime_type @controller.template.formats = [mime_type.to_sym] |