diff options
| author | Yehuda Katz <wycats@gmail.com> | 2009-08-09 07:14:24 -0300 |
|---|---|---|
| committer | Yehuda Katz <wycats@gmail.com> | 2009-08-11 15:03:52 -0700 |
| commit | 04d4537cd40d0415d15af4395213632735c8683f (patch) | |
| tree | 7a03845cceb50e14f75e83658e6651266975ff74 /actionpack/lib/action_dispatch/http | |
| parent | 0a558b36eb3858ceeb926ada1388b0bd41da11f7 (diff) | |
| download | rails-04d4537cd40d0415d15af4395213632735c8683f.tar.gz rails-04d4537cd40d0415d15af4395213632735c8683f.tar.bz2 rails-04d4537cd40d0415d15af4395213632735c8683f.zip | |
This change causes some failing tests, but it should be possible to make them pass with minimal performance impact.
Diffstat (limited to 'actionpack/lib/action_dispatch/http')
| -rwxr-xr-x | actionpack/lib/action_dispatch/http/request.rb | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/actionpack/lib/action_dispatch/http/request.rb b/actionpack/lib/action_dispatch/http/request.rb index 4190fa21cd..958a541436 100755 --- a/actionpack/lib/action_dispatch/http/request.rb +++ b/actionpack/lib/action_dispatch/http/request.rb @@ -176,17 +176,18 @@ module ActionDispatch # Expand raw_formats by converting Mime::ALL to the Mime::SET. # def formats - if ActionController::Base.use_accept_header - raw_formats.tap do |ret| - if ret == ONLY_ALL - ret.replace Mime::SET - elsif all = ret.index(Mime::ALL) - ret.delete_at(all) && ret.insert(all, *Mime::SET) - end - end - else - raw_formats + Mime::SET - end + return raw_formats + # if ActionController::Base.use_accept_header + # raw_formats.tap do |ret| + # if ret == ONLY_ALL + # ret.replace Mime::SET + # elsif all = ret.index(Mime::ALL) + # ret.delete_at(all) && ret.insert(all, *Mime::SET) + # end + # end + # else + # raw_formats + Mime::SET + # end end # Sets the \format by string extension, which can be used to force custom formats |