aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack')
-rwxr-xr-xactionpack/lib/action_controller/base.rb6
-rw-r--r--actionpack/lib/action_controller/vendor/xml_node.rb1
2 files changed, 2 insertions, 5 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index e4877f82fd..8053cc3faf 100755
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -261,7 +261,7 @@ module ActionController #:nodoc:
cattr_accessor :allow_concurrency
# Modern REST web services often need to submit complex data to the web application.
- # the param_parsers hash lets you register handlers wich will process the http body and add parameters to the
+ # The param_parsers hash lets you register handlers wich will process the http body and add parameters to the
# @params hash. These handlers are invoked for post and put requests.
#
# By default application/xml is enabled. a XmlNode class with the same param name as the root
@@ -281,9 +281,7 @@ module ActionController #:nodoc:
# ActionController::Base.param_parsers['application/xml'] = :xml_simple
# ActionController::Base.param_parsers['application/x-yaml'] = :yaml
#
- @@param_parsers = {
- 'application/xml' => :xml_node
- }
+ @@param_parsers = { 'application/xml' => :xml_node }
cattr_accessor :param_parsers
# Template root determines the base from which template references will be made. So a call to render("test/template")
diff --git a/actionpack/lib/action_controller/vendor/xml_node.rb b/actionpack/lib/action_controller/vendor/xml_node.rb
index c4e2f98fbf..b495ebc207 100644
--- a/actionpack/lib/action_controller/vendor/xml_node.rb
+++ b/actionpack/lib/action_controller/vendor/xml_node.rb
@@ -1,7 +1,6 @@
require 'rexml/document'
# SimpleXML like xml parser. Written by leon breet from the ruby on rails Mailing list
-#
class XmlNode
attr :node