kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

add comment.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45813 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2014-05-04 15:51:05 +00:00
parent 40c6eaf6d8
commit 0b53b86d47
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/time.rb
View file

@ -178,8 +178,12 @@ class Time
if zone_utc?(zone) if zone_utc?(zone)
t.utc t.utc
elsif offset ||= zone_offset(zone) elsif offset ||= zone_offset(zone)
# Prefer the local (real) timezone over the fixed offset (artificial)
# timezone.
t.localtime t.localtime
if t.utc_offset != offset if t.utc_offset != offset
# Use the fixed offset timezone only if the local timezone cannot
# represent the given offset.
t.localtime(offset) t.localtime(offset)
end end
else else