Skip to content

Commit bf830c3

Browse files
committed
Fix ActiveSupport edge case
1 parent dfdf6db commit bf830c3

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

lib/ice_cube/time_util.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ def self.deserialize_time(time_or_hash)
8282
# keep it. If it was serialized with a different offset than local TZ it
8383
# will lose the zone and not support DST.
8484
def self.restore_deserialized_offset(time, orig_offset_str)
85-
return time if time.respond_to?(:time_zone) or
85+
return time if time.respond_to?(:time_zone) ||
8686
time.getlocal(orig_offset_str).utc_offset == time.utc_offset
8787
warn 'IceCube: parsed Time from nonlocal TZ. Use ActiveSupport to fix DST'
8888
time.localtime(orig_offset_str)

0 commit comments

Comments
 (0)