diff options
| author | Sean Griffin <sean@thoughtbot.com> | 2014-12-23 07:13:54 -0700 |
|---|---|---|
| committer | Sean Griffin <sean@thoughtbot.com> | 2014-12-23 07:13:54 -0700 |
| commit | a054269ff8a3589784e25729359f71d0838b5d3e (patch) | |
| tree | 84219728baa43c39b7192eb8ffea04c001a7c456 /activerecord/lib | |
| parent | b5bfd6fe521dc2d3bf6ad1046905ea9751488f2d (diff) | |
| parent | d318badc269358c53d9dfb4000e8c4c21a94b578 (diff) | |
| download | rails-a054269ff8a3589784e25729359f71d0838b5d3e.tar.gz rails-a054269ff8a3589784e25729359f71d0838b5d3e.tar.bz2 rails-a054269ff8a3589784e25729359f71d0838b5d3e.zip | |
Merge Pull Request #18157
Conflicts:
activerecord/CHANGELOG.md
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb | 6 |
1 files changed, 5 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 87274dd4e1..777f7ab4d7 100644 --- a/activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb +++ b/activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb @@ -12,7 +12,11 @@ module ActiveRecord if value.is_a?(Array) value.map { |v| type_cast_from_user(v) } elsif value.respond_to?(:in_time_zone) - value.in_time_zone || super + begin + value.in_time_zone || super + rescue ArgumentError + nil + end end end |