Base#instantiate_time_object: eliminate check for Time.zone, since we can assume this is set if time_zone_aware_attributes is set to true
This commit is contained in:
parent
4f03190f26
commit
79e44a5ee4
@ -1,5 +1,7 @@
|
||||
*SVN*
|
||||
|
||||
* Base#instantiate_time_object: eliminate check for Time.zone, since we can assume this is set if time_zone_aware_attributes is set to true [Geoff Buesing]
|
||||
|
||||
* Time zone aware attribute methods use Time.zone.parse instead of #to_time for String arguments, so that offset information in String is respected. Resolves #105. [Scott Fleckenstein, Geoff Buesing]
|
||||
|
||||
* Added change_table for migrations (Jeff Dean) [#71]. Example:
|
||||
|
@ -2571,7 +2571,7 @@ def assign_multiparameter_attributes(pairs)
|
||||
end
|
||||
|
||||
def instantiate_time_object(name, values)
|
||||
if Time.zone && self.class.time_zone_aware_attributes && !self.class.skip_time_zone_conversion_for_attributes.include?(name.to_sym)
|
||||
if self.class.time_zone_aware_attributes && !self.class.skip_time_zone_conversion_for_attributes.include?(name.to_sym)
|
||||
Time.zone.local(*values)
|
||||
else
|
||||
Time.time_with_datetime_fallback(@@default_timezone, *values)
|
||||
|
Loading…
Reference in New Issue
Block a user