diff options
| author | Joshua Peek <josh@joshpeek.com> | 2011-04-12 21:56:00 -0500 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2011-04-12 21:56:00 -0500 |
| commit | ed24595647374885cebc1d43badc174c0991e93a (patch) | |
| tree | 020a8c856c264ed34deb872e54cf447e2fd872a3 /activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb | |
| parent | d7b521db1297c1b95a441b3928fc31ab3abd5ed5 (diff) | |
| parent | f0e198bfa1e3f9689e0cde1d194a44027fc90b3c (diff) | |
| download | rails-ed24595647374885cebc1d43badc174c0991e93a.tar.gz rails-ed24595647374885cebc1d43badc174c0991e93a.tar.bz2 rails-ed24595647374885cebc1d43badc174c0991e93a.zip | |
Merge branch 'master' into sprockets
Diffstat (limited to 'activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb')
| -rw-r--r-- | activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb b/activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb index 6aac96df6f..67b0e77a25 100644 --- a/activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb +++ b/activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb @@ -1,4 +1,5 @@ require 'active_support/core_ext/class/attribute' +require 'active_support/core_ext/object/inclusion' module ActiveRecord module AttributeMethods @@ -58,7 +59,7 @@ module ActiveRecord private def create_time_zone_conversion_attribute?(name, column) - time_zone_aware_attributes && !self.skip_time_zone_conversion_for_attributes.include?(name.to_sym) && [:datetime, :timestamp].include?(column.type) + time_zone_aware_attributes && !self.skip_time_zone_conversion_for_attributes.include?(name.to_sym) && column.type.among?(:datetime, :timestamp) end end end |