diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2006-03-07 04:52:49 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2006-03-07 04:52:49 +0000 |
| commit | 6fd737b76b7024fbc7d27f99139c9a0d052b1fc3 (patch) | |
| tree | 5506e3652e206a7824d32a5d1ebe467ae732a179 | |
| parent | 0fbe6837b1e7330f394e94a913fd58f0299a04b3 (diff) | |
| download | rails-6fd737b76b7024fbc7d27f99139c9a0d052b1fc3.tar.gz rails-6fd737b76b7024fbc7d27f99139c9a0d052b1fc3.tar.bz2 rails-6fd737b76b7024fbc7d27f99139c9a0d052b1fc3.zip | |
Proper options for XmlSimple
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3808 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
| -rwxr-xr-x | actionpack/lib/action_controller/cgi_ext/cgi_methods.rb | 2 | ||||
| -rwxr-xr-x | actionpack/lib/action_controller/request.rb | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/cgi_ext/cgi_methods.rb b/actionpack/lib/action_controller/cgi_ext/cgi_methods.rb index 3e65e5cb3a..e09fc4ac11 100755 --- a/actionpack/lib/action_controller/cgi_ext/cgi_methods.rb +++ b/actionpack/lib/action_controller/cgi_ext/cgi_methods.rb @@ -63,7 +63,7 @@ class CGIMethods #:nodoc: when Proc strategy.call(raw_post_data) when :xml_simple - XmlSimple.xml_in(raw_post_data, 'ForceArray' => false, :keeproot => true) + XmlSimple.xml_in(raw_post_data, 'ForceArray' => false, 'keeproot' => true) when :yaml YAML.load(raw_post_data) when :xml_node diff --git a/actionpack/lib/action_controller/request.rb b/actionpack/lib/action_controller/request.rb index 06b6601fb4..b55f63e618 100755 --- a/actionpack/lib/action_controller/request.rb +++ b/actionpack/lib/action_controller/request.rb @@ -155,7 +155,6 @@ module ActionController # This method returns nil unless the web server is apache. def relative_url_root @@relative_url_root ||= server_software == 'apache' ? @env["SCRIPT_NAME"].to_s.sub(/\/dispatch\.(fcgi|rb|cgi)$/, '') : '' - end # Returns the port number of this request as an integer. |