diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2008-12-15 11:05:29 -0800 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-12-15 11:05:29 -0800 |
| commit | 0d48408dccd2b69754310cb3702ddfe705dbcd12 (patch) | |
| tree | a49d066809ea58dc01acd38752d0566df602d719 /actionpack/lib/action_controller/integration.rb | |
| parent | 262fef7ed57520b857605a0105fe7ba9265654f6 (diff) | |
| parent | 4966076d35d5d9510590d87d90dae8daf79b2069 (diff) | |
| download | rails-0d48408dccd2b69754310cb3702ddfe705dbcd12.tar.gz rails-0d48408dccd2b69754310cb3702ddfe705dbcd12.tar.bz2 rails-0d48408dccd2b69754310cb3702ddfe705dbcd12.zip | |
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'actionpack/lib/action_controller/integration.rb')
| -rw-r--r-- | actionpack/lib/action_controller/integration.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller/integration.rb b/actionpack/lib/action_controller/integration.rb index 0f0db03b6b..212a293da0 100644 --- a/actionpack/lib/action_controller/integration.rb +++ b/actionpack/lib/action_controller/integration.rb @@ -227,9 +227,7 @@ module ActionController def xml_http_request(request_method, path, parameters = nil, headers = nil) headers ||= {} headers['X-Requested-With'] = 'XMLHttpRequest' - headers['Accept'] ||= 'text/javascript, text/html, application/xml, ' + - 'text/xml, */*' - + headers['Accept'] ||= [Mime::JS, Mime::HTML, Mime::XML, 'text/xml', Mime::ALL].join(', ') process(request_method, path, parameters, headers) end alias xhr :xml_http_request |