diff options
| author | alpaca-tc <alpaca-tc@alpaca.tc> | 2016-07-15 04:12:11 +0900 |
|---|---|---|
| committer | alpaca-tc <alpaca-tc@alpaca.tc> | 2016-07-19 22:35:45 +0900 |
| commit | 780535017ae3071c87f29b1bf7ea2015959a6c21 (patch) | |
| tree | ab3a54bbc1a1e250c63e1e3585c7d5ca0512e26c /activerecord/lib/active_record/attribute_methods | |
| parent | d8bc0964d29837407efe425d7a65ab9a27d96e82 (diff) | |
| download | rails-780535017ae3071c87f29b1bf7ea2015959a6c21.tar.gz rails-780535017ae3071c87f29b1bf7ea2015959a6c21.tar.bz2 rails-780535017ae3071c87f29b1bf7ea2015959a6c21.zip | |
Fixes multiparameter attributes conversion with time_zone_aware_attributes and invalid params
Diffstat (limited to 'activerecord/lib/active_record/attribute_methods')
| -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 e160460286..cbb4f0cff8 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 + ::Time.zone.local_to_utc(value).in_time_zone if value end def map_avoiding_infinite_recursion(value) |