diff options
| author | José Valim <jose.valim@gmail.com> | 2009-11-11 08:16:25 -0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2009-11-11 08:16:25 -0200 |
| commit | 01ae99c681d31803f3a29f8305c9a041aa456660 (patch) | |
| tree | 7fdb9e32b743aeb254854371349cecfd2499defa /actionpack/lib/action_dispatch/http/request.rb | |
| parent | d002826e54415a340e55fdbf363d005faebf8fc5 (diff) | |
| parent | fca32eb6c5b41e4f19a25b7b246c4a8a3d763667 (diff) | |
| download | rails-01ae99c681d31803f3a29f8305c9a041aa456660.tar.gz rails-01ae99c681d31803f3a29f8305c9a041aa456660.tar.bz2 rails-01ae99c681d31803f3a29f8305c9a041aa456660.zip | |
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'actionpack/lib/action_dispatch/http/request.rb')
| -rwxr-xr-x | actionpack/lib/action_dispatch/http/request.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/http/request.rb b/actionpack/lib/action_dispatch/http/request.rb index 75be2cc260..b3bb8c623f 100755 --- a/actionpack/lib/action_dispatch/http/request.rb +++ b/actionpack/lib/action_dispatch/http/request.rb @@ -5,7 +5,7 @@ require 'strscan' require 'active_support/memoizable' require 'active_support/core_ext/array/wrap' require 'active_support/core_ext/hash/indifferent_access' -require 'active_support/core_ext/object/tap' +require 'active_support/core_ext/string/access' module ActionDispatch class Request < Rack::Request @@ -166,7 +166,7 @@ module ActionDispatch @env["action_dispatch.request.formats"] ||= if parameters[:format] - [Mime[parameters[:format]]] + Array.wrap(Mime[parameters[:format]]) elsif xhr? || (accept && !accept.include?(?,)) accepts else |