aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib
diff options
context:
space:
mode:
authorRick Olson <technoweenie@gmail.com>2007-06-05 14:09:15 +0000
committerRick Olson <technoweenie@gmail.com>2007-06-05 14:09:15 +0000
commited1ed9ed97f7d30ba8221079365634aa9c4bf24c (patch)
tree4564504ab18ee63adf2191595513141833430245 /activesupport/lib
parent319107ae40bc00772f4eaf91ab9531097bc537cb (diff)
downloadrails-ed1ed9ed97f7d30ba8221079365634aa9c4bf24c.tar.gz
rails-ed1ed9ed97f7d30ba8221079365634aa9c4bf24c.tar.bz2
rails-ed1ed9ed97f7d30ba8221079365634aa9c4bf24c.zip
revert [6924]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6946 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activesupport/lib')
-rw-r--r--activesupport/lib/active_support/core_ext/array/conversions.rb2
-rw-r--r--activesupport/lib/active_support/core_ext/hash/conversions.rb14
2 files changed, 1 insertions, 15 deletions
diff --git a/activesupport/lib/active_support/core_ext/array/conversions.rb b/activesupport/lib/active_support/core_ext/array/conversions.rb
index 6950e21027..a4d056e81c 100644
--- a/activesupport/lib/active_support/core_ext/array/conversions.rb
+++ b/activesupport/lib/active_support/core_ext/array/conversions.rb
@@ -63,7 +63,7 @@ module ActiveSupport #:nodoc:
opts = options.merge({ :root => children })
- options[:builder].tag!(root, options[:skip_types] ? {} : {:type => "array"}) {
+ options[:builder].tag!(root) {
yield options[:builder] if block_given?
each { |e| e.to_xml(opts.merge!({ :skip_instruct => true })) }
}
diff --git a/activesupport/lib/active_support/core_ext/hash/conversions.rb b/activesupport/lib/active_support/core_ext/hash/conversions.rb
index 2cccd9c30e..2334bb671b 100644
--- a/activesupport/lib/active_support/core_ext/hash/conversions.rb
+++ b/activesupport/lib/active_support/core_ext/hash/conversions.rb
@@ -163,20 +163,6 @@ module ActiveSupport #:nodoc:
else
content
end
- elsif value['type'] == 'array'
- child_key, entries = value.detect { |k,v| k != 'type' } # child_key is throwaway
- if entries.nil?
- []
- else
- case entries.class.to_s # something weird with classes not matching here. maybe singleton methods breaking is_a?
- when "Array"
- entries.collect { |v| typecast_xml_value(v) }
- when "Hash"
- [typecast_xml_value(entries)]
- else
- raise "can't typecast #{entries.inspect}"
- end
- end
elsif value['type'] == 'string' && value['nil'] != 'true'
""
else