diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2007-02-15 18:52:08 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2007-02-15 18:52:08 +0000 |
| commit | 06669f8b13b351c251bc24eb2068c5005c9776a8 (patch) | |
| tree | 7ad81eb99f425d49c9305bd8ab3f28063d1329d1 /actionpack | |
| parent | e312cc32152933d280ac8dac72d66485d28b24ba (diff) | |
| download | rails-06669f8b13b351c251bc24eb2068c5005c9776a8.tar.gz rails-06669f8b13b351c251bc24eb2068c5005c9776a8.tar.bz2 rails-06669f8b13b351c251bc24eb2068c5005c9776a8.zip | |
In tests, content_type can be nil, which would disturb accepts/format
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6155 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack')
| -rwxr-xr-x | actionpack/lib/action_controller/request.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/request.rb b/actionpack/lib/action_controller/request.rb index b1c8692ce1..9f75b32f06 100755 --- a/actionpack/lib/action_controller/request.rb +++ b/actionpack/lib/action_controller/request.rb @@ -78,7 +78,7 @@ module ActionController def accepts @accepts ||= if @env['HTTP_ACCEPT'].to_s.strip.empty? - [ content_type, Mime::ALL ] + [ content_type, Mime::ALL ].compact # make sure content_type being nil is not included else Mime::Type.parse(@env['HTTP_ACCEPT']) end |