From ed1ed9ed97f7d30ba8221079365634aa9c4bf24c Mon Sep 17 00:00:00 2001 From: Rick Olson Date: Tue, 5 Jun 2007 14:09:15 +0000 Subject: revert [6924] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6946 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- .../lib/active_support/core_ext/array/conversions.rb | 2 +- .../lib/active_support/core_ext/hash/conversions.rb | 14 -------------- 2 files changed, 1 insertion(+), 15 deletions(-) (limited to 'activesupport/lib') 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 -- cgit v1.2.3