Browse files

Correctly convert <foo nil=true> to nil when using Hash.create_from_x…

…ml. [Rick]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4607 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 35f7cc2 commit 1ec9f8d049eda0c52a3045752ed447f371462676 @technoweenie technoweenie committed Jul 13, 2006
View
2 activesupport/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Correctly convert <foo nil="true"> to nil when using Hash.create_from_xml. [Rick]
+
* Optional identity for Enumerable#sum defaults to zero. #5657 [gensym@mac.com]
* HashWithIndifferentAccess shouldn't confuse false and nil. #5601 [shugo@ruby-lang.org]
View
2 activesupport/lib/active_support/core_ext/hash/conversions.rb
@@ -101,7 +101,7 @@ def typecast_xml_value(value)
else content
end
else
- value.empty? ? nil : value.inject({}) do |h,(k,v)|
+ value.empty? || value['nil'] == 'true' ? nil : value.inject({}) do |h,(k,v)|
h[k] = typecast_xml_value(v)
h
end
View
2 activesupport/test/core_ext/hash_ext_test.rb
@@ -352,7 +352,7 @@ def test_multiple_records_from_xml
<viewed-at type="datetime">2003-07-16T09:28:00+0000</viewed-at>
<content>Have a nice day</content>
<author-email-address>david@loudthinking.com</author-email-address>
- <parent-id></parent-id>
+ <parent-id nil="true"></parent-id>
</topic>
<topic>
<title>The Second Topic</title>

0 comments on commit 1ec9f8d

Please sign in to comment.