diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2007-12-17 00:10:18 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2007-12-17 00:10:18 +0000 |
| commit | 436da684dc3e85c4251d6e586913b8520add8638 (patch) | |
| tree | a1a3dbcc4efbeb0502fee524854afd79ae59bef3 /actionpack/lib/action_controller/integration.rb | |
| parent | 26e10218bc5e5c899b88f8d08b8abfb251b3af10 (diff) | |
| download | rails-436da684dc3e85c4251d6e586913b8520add8638.tar.gz rails-436da684dc3e85c4251d6e586913b8520add8638.tar.bz2 rails-436da684dc3e85c4251d6e586913b8520add8638.zip | |
Allow headers[Accept] to be set by hand when calling xml_http_request (closes #10461) [BMorearty]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8426 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller/integration.rb')
| -rw-r--r-- | actionpack/lib/action_controller/integration.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/integration.rb b/actionpack/lib/action_controller/integration.rb index 18050ae903..75e6796dc9 100644 --- a/actionpack/lib/action_controller/integration.rb +++ b/actionpack/lib/action_controller/integration.rb @@ -187,7 +187,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'] ||= 'text/javascript, text/html, application/xml, text/xml, */*' process(request_method, path, parameters, headers) end |