diff options
author | brainopia <brainopia@evilmartians.com> | 2012-01-18 12:29:29 +0400 |
---|---|---|
committer | brainopia <brainopia@evilmartians.com> | 2012-01-18 12:29:29 +0400 |
commit | e58a2dff70240d0b7634636a54a379e78cada3be (patch) | |
tree | 5c7766e626e63d327d0ec23639d0e050b7b33578 /activesupport/lib | |
parent | d4a9ce8ec06f72215c9ee3d9c4d0156fdad6e571 (diff) | |
download | rails-e58a2dff70240d0b7634636a54a379e78cada3be.tar.gz rails-e58a2dff70240d0b7634636a54a379e78cada3be.tar.bz2 rails-e58a2dff70240d0b7634636a54a379e78cada3be.zip |
Update time zone offset information
Diffstat (limited to 'activesupport/lib')
-rw-r--r-- | activesupport/lib/active_support/core_ext/date_time/calculations.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/core_ext/date_time/calculations.rb b/activesupport/lib/active_support/core_ext/date_time/calculations.rb index 6dd321ecf9..e42453389e 100644 --- a/activesupport/lib/active_support/core_ext/date_time/calculations.rb +++ b/activesupport/lib/active_support/core_ext/date_time/calculations.rb @@ -2,7 +2,7 @@ class DateTime class << self # DateTimes aren't aware of DST rules, so use a consistent non-DST offset when creating a DateTime with an offset in the local zone def local_offset - ::Time.local(2007).utc_offset.to_r / 86400 + ::Time.local(2012).utc_offset.to_r / 86400 end # Returns <tt>Time.zone.now.to_datetime</tt> when <tt>Time.zone</tt> or <tt>config.time_zone</tt> are set, otherwise returns <tt>Time.now.to_datetime</tt>. |