diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2009-03-14 13:12:13 +0000 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2009-03-14 13:12:13 +0000 |
| commit | b8ad501c910f9ba987bd5390b81006b73ff80bb1 (patch) | |
| tree | 2a4b20d8ad635f7460829c4d4b648762ff700314 /activesupport/lib | |
| parent | 626221d17c64b4cfb2807c7514de704c82c4c814 (diff) | |
| parent | ac3848201dfd7400708d3ccae0acb9388318fb99 (diff) | |
| download | rails-b8ad501c910f9ba987bd5390b81006b73ff80bb1.tar.gz rails-b8ad501c910f9ba987bd5390b81006b73ff80bb1.tar.bz2 rails-b8ad501c910f9ba987bd5390b81006b73ff80bb1.zip | |
Merge commit 'mainstream/master'
Diffstat (limited to 'activesupport/lib')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/hash/conversions.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/core_ext/hash/conversions.rb b/activesupport/lib/active_support/core_ext/hash/conversions.rb index 991a5a6a89..10435975c5 100644 --- a/activesupport/lib/active_support/core_ext/hash/conversions.rb +++ b/activesupport/lib/active_support/core_ext/hash/conversions.rb @@ -24,11 +24,12 @@ module ActiveSupport #:nodoc: "Bignum" => "integer", "BigDecimal" => "decimal", "Float" => "float", + "TrueClass" => "boolean", + "FalseClass" => "boolean", "Date" => "date", "DateTime" => "datetime", "Time" => "datetime", - "TrueClass" => "boolean", - "FalseClass" => "boolean" + "ActiveSupport::TimeWithZone" => "datetime" } unless defined?(XML_TYPE_NAMES) XML_FORMATTING = { |