diff options
| author | Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | 2009-06-17 12:00:23 -0700 |
|---|---|---|
| committer | Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | 2009-06-17 12:54:19 -0700 |
| commit | 4fad953f90f82e860a69d67745887b40d5b15475 (patch) | |
| tree | f66c81f08091549160ce064dce257017f5567282 /actionpack/lib/action_dispatch/http/request.rb | |
| parent | de388ba864ab47cbb3d92b3a36af254540788ed5 (diff) | |
| download | rails-4fad953f90f82e860a69d67745887b40d5b15475.tar.gz rails-4fad953f90f82e860a69d67745887b40d5b15475.tar.bz2 rails-4fad953f90f82e860a69d67745887b40d5b15475.zip | |
Fixing pending tests and fixed some formats / partial rendering semantics
Diffstat (limited to 'actionpack/lib/action_dispatch/http/request.rb')
| -rwxr-xr-x | actionpack/lib/action_dispatch/http/request.rb | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/actionpack/lib/action_dispatch/http/request.rb b/actionpack/lib/action_dispatch/http/request.rb index 140feb9a68..3f23a5af7a 100755 --- a/actionpack/lib/action_dispatch/http/request.rb +++ b/actionpack/lib/action_dispatch/http/request.rb @@ -180,12 +180,10 @@ module ActionDispatch else accepts.dup end.tap do |ret| - if defined?(ActionController::Http) - if ret == ONLY_ALL - ret.replace Mime::SET - elsif all = ret.index(Mime::ALL) - ret.delete_at(all) && ret.insert(all, *Mime::SET) - end + 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 |