diff options
author | Josh Kalderimis <josh.kalderimis@gmail.com> | 2011-02-27 20:24:39 +0100 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2011-02-28 14:05:49 -0800 |
commit | 0f8d2794f229175447163d2b5e16d94d2cee5468 (patch) | |
tree | ef64056364232df6c68ce12581ef09f1bdaed5ce /activesupport/lib/active_support/core_ext/date/zones.rb | |
parent | de9713186d693652deed22cff121b43317e86ef0 (diff) | |
download | rails-0f8d2794f229175447163d2b5e16d94d2cee5468.tar.gz rails-0f8d2794f229175447163d2b5e16d94d2cee5468.tar.bz2 rails-0f8d2794f229175447163d2b5e16d94d2cee5468.zip |
updated Time, Date and DateTime current methods in AS to use Time.zone and not Time.zone_default.
[#6410 state:committed]
Diffstat (limited to 'activesupport/lib/active_support/core_ext/date/zones.rb')
-rw-r--r-- | activesupport/lib/active_support/core_ext/date/zones.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/activesupport/lib/active_support/core_ext/date/zones.rb b/activesupport/lib/active_support/core_ext/date/zones.rb index 3a83af6be2..a70b47b7bc 100644 --- a/activesupport/lib/active_support/core_ext/date/zones.rb +++ b/activesupport/lib/active_support/core_ext/date/zones.rb @@ -2,10 +2,10 @@ require 'date' require 'active_support/core_ext/time/zones' class Date - # Converts Date to a TimeWithZone in the current zone if Time.zone_default is set, - # otherwise converts Date to a Time via Date#to_time + # Converts Date to a TimeWithZone in the current zone if Time.zone or Time.zone_default + # is set, otherwise converts Date to a Time via Date#to_time def to_time_in_current_zone - if ::Time.zone_default + if ::Time.zone ::Time.zone.local(year, month, day) else to_time |