aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/request.rb
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2006-03-12 06:02:44 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2006-03-12 06:02:44 +0000
commit7af12d04cebe3a1ffcf55cae967d22fc7b0606c8 (patch)
tree2c3345004b15682c6344126c3bfe49c8a4f79a15 /actionpack/lib/action_controller/request.rb
parent9e2932f816b0cac68361bb5adcdad3e4c3caeb04 (diff)
downloadrails-7af12d04cebe3a1ffcf55cae967d22fc7b0606c8.tar.gz
rails-7af12d04cebe3a1ffcf55cae967d22fc7b0606c8.tar.bz2
rails-7af12d04cebe3a1ffcf55cae967d22fc7b0606c8.zip
Added synonym and custom type handling to respond_to [DHH]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3844 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller/request.rb')
-rwxr-xr-xactionpack/lib/action_controller/request.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/request.rb b/actionpack/lib/action_controller/request.rb
index 300a0ea60c..cbefc2e490 100755
--- a/actionpack/lib/action_controller/request.rb
+++ b/actionpack/lib/action_controller/request.rb
@@ -61,7 +61,7 @@ module ActionController
end
end
- @content_type = Mime::Type.new(@content_type)
+ @content_type = Mime::Type.lookup(@content_type)
end
def accepts
@@ -71,7 +71,7 @@ module ActionController
[ content_type, Mime::ALL ]
else
@env['HTTP_ACCEPT'].split(";").collect! do |mime_type|
- Mime::Type.new(mime_type.strip)
+ Mime::Type.lookup(mime_type.strip)
end
end
end