mirrors
/
rails
mirror of https://github.com/rails/rails
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #13709 from akshay-vishnoi/typo 

[ci skip] Grammar correction
This commit is contained in:
Yves Senn 2014-01-14 00:29:32 -08:00
parent 66f3d5bd5a a71a8e2a35
commit d901699aca
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
activesupport/lib/active_support/core_ext/hash/conversions.rb
View File

@ -105,7 +105,7 @@ class Hash
# hash = Hash.from_xml(xml) # hash = Hash.from_xml(xml)
# # => {"hash"=>{"foo"=>1, "bar"=>2}} # # => {"hash"=>{"foo"=>1, "bar"=>2}}
# #
# DisallowedType is raise if the XML contains attributes with <tt>type="yaml"</tt> or # DisallowedType is raised if the XML contains attributes with <tt>type="yaml"</tt> or
# <tt>type="symbol"</tt>. Use <tt>Hash.from_trusted_xml</tt> to parse this XML. # <tt>type="symbol"</tt>. Use <tt>Hash.from_trusted_xml</tt> to parse this XML.
def from_xml(xml, disallowed_types = nil) def from_xml(xml, disallowed_types = nil)
ActiveSupport::XMLConverter.new(xml, disallowed_types).to_h ActiveSupport::XMLConverter.new(xml, disallowed_types).to_h