diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2006-03-12 19:01:09 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2006-03-12 19:01:09 +0000 |
| commit | 60e40647d7e316600cc9e113ff2af9637f9ecec0 (patch) | |
| tree | b2ba137eab7bb11336e11fe649519ff0aaa8df3f /actionpack/lib/action_controller/request.rb | |
| parent | 09cec7824800bdd29c97356c71b51acf47ef6bcc (diff) | |
| download | rails-60e40647d7e316600cc9e113ff2af9637f9ecec0.tar.gz rails-60e40647d7e316600cc9e113ff2af9637f9ecec0.tar.bz2 rails-60e40647d7e316600cc9e113ff2af9637f9ecec0.zip | |
Prepare for mime type reordering depending on the branch [DHH]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3850 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller/request.rb')
| -rwxr-xr-x | actionpack/lib/action_controller/request.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller/request.rb b/actionpack/lib/action_controller/request.rb index d5879078af..3bfc8f9385 100755 --- a/actionpack/lib/action_controller/request.rb +++ b/actionpack/lib/action_controller/request.rb @@ -70,9 +70,7 @@ module ActionController @accepts = if @env['HTTP_ACCEPT'].to_s.strip.blank? [ content_type, Mime::ALL ] else - @env['HTTP_ACCEPT'].split(",").collect! do |mime_type| - Mime::Type.lookup(mime_type.split(";").first.strip) - end + Mime::Type.parse(@env['HTTP_ACCEPT']) end end |