diff options
| author | Sen-Zhang <solowolf21@126.com> | 2016-03-14 18:51:25 -0700 |
|---|---|---|
| committer | Sen-Zhang <solowolf21@126.com> | 2016-11-01 18:17:26 -0700 |
| commit | 9bf4583241e189d04a5df143332107ef18857034 (patch) | |
| tree | 91b8eb5ba3f8b5108508fe70e0918d94b2478199 /activerecord/lib/active_record | |
| parent | 9ebb3558f4bddc2af52829abd2b198bc7fab4a13 (diff) | |
| download | rails-9bf4583241e189d04a5df143332107ef18857034.tar.gz rails-9bf4583241e189d04a5df143332107ef18857034.tar.bz2 rails-9bf4583241e189d04a5df143332107ef18857034.zip | |
fix datatime error
Diffstat (limited to 'activerecord/lib/active_record')
| -rw-r--r-- | activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb | 2 |
1 files changed, 1 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 ce9985e2e1..500d903857 100644 --- a/activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb +++ b/activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb @@ -39,7 +39,7 @@ module ActiveRecord end def set_time_zone_without_conversion(value) - ::Time.zone.local_to_utc(value).in_time_zone if value + ::Time.zone.local_to_utc(value).try(:in_time_zone) if value end def map_avoiding_infinite_recursion(value) |