Permalink
Browse files

Merge pull request #4514 from brainopia/update_timezone_offets

Update time zone offset information
  • Loading branch information...
2 parents ad6f689 + e58a2df commit 8478b0ca0b90bcf4210bf82938d73112d2e6b010 @tenderlove tenderlove committed Jan 24, 2012
Showing with 1 addition and 1 deletion.
  1. +1 −1 activesupport/lib/active_support/core_ext/date_time/calculations.rb
View
2 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>.

0 comments on commit 8478b0c

Please sign in to comment.