Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Ruby 1.9 compat: TimeZone avoids localtime conversion. References #1689

… [Chu Yeow]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8369 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
commit bcbcc0260b4f75e9da7f009dfc7e3e0233158274 1 parent d0b5f64
@jeremy jeremy authored
View
7 activesupport/lib/active_support/values/time_zone.rb
@@ -45,7 +45,7 @@ def today
# Adjust the given time to the time zone represented by +self+.
def adjust(time)
- time = time.to_time
+ time = time.to_time unless time.is_a?(::Time)
time + utc_offset - time.utc_offset
end
@@ -53,8 +53,9 @@ def adjust(time)
# zone, and then adjusts it to return the corresponding time in the
# local time zone.
def unadjust(time)
- time = Time.local(*time.to_time.to_a)
- time - utc_offset + time.utc_offset
+ time = time.to_time unless time.is_a?(::Time)
+ time = time.localtime
+ time - utc_offset - time.utc_offset
end
# Compare this time zone to the parameter. The two are comapred first on
View
2  activesupport/test/time_zone_test.rb
@@ -34,7 +34,7 @@ def test_today
end
def test_adjust_negative
- zone = TimeZone.create( "Test", -4200 )
+ zone = TimeZone.create( "Test", -4200 ) # 4200s == 70 mins
assert_equal Time.utc(2004,7,24,23,55,0), zone.adjust(Time.utc(2004,7,25,1,5,0))
end
Please sign in to comment.
Something went wrong with that request. Please try again.