diff options
author | Vijay Dev <vijaydev.cse@gmail.com> | 2012-05-26 17:49:59 +0530 |
---|---|---|
committer | Vijay Dev <vijaydev.cse@gmail.com> | 2012-05-26 17:49:59 +0530 |
commit | 575e77ba167844c0ef492897240d9568cdc9b5f5 (patch) | |
tree | f5aa8322a8f2e27af5ff8c132eacc87e2741deef /activesupport/lib/active_support/core_ext/hash | |
parent | e8cac28917261d6001ab0dbf2da72ef028b3ab72 (diff) | |
parent | 06731530ff4f13facdfa60e4db55ea9c081cd055 (diff) | |
download | rails-575e77ba167844c0ef492897240d9568cdc9b5f5.tar.gz rails-575e77ba167844c0ef492897240d9568cdc9b5f5.tar.bz2 rails-575e77ba167844c0ef492897240d9568cdc9b5f5.zip |
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'activesupport/lib/active_support/core_ext/hash')
-rw-r--r-- | activesupport/lib/active_support/core_ext/hash/conversions.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/core_ext/hash/conversions.rb b/activesupport/lib/active_support/core_ext/hash/conversions.rb index 43ba05a256..7c72ead36c 100644 --- a/activesupport/lib/active_support/core_ext/hash/conversions.rb +++ b/activesupport/lib/active_support/core_ext/hash/conversions.rb @@ -129,7 +129,7 @@ class Hash else xml_value = Hash[value.map { |k,v| [k, typecast_xml_value(v)] }] - # Turn { :files => { :file => #<StringIO> } into { :files => #<StringIO> } so it is compatible with + # Turn { :files => { :file => #<StringIO> } } into { :files => #<StringIO> } so it is compatible with # how multipart uploaded files from HTML appear xml_value['file'].is_a?(StringIO) ? xml_value['file'] : xml_value end |