diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2012-01-24 11:16:39 -0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2012-01-24 11:16:39 -0800 |
| commit | 8478b0ca0b90bcf4210bf82938d73112d2e6b010 (patch) | |
| tree | 1e2e9eb641e9b72e1dd8d46d985556c07e815843 /activesupport/lib/active_support/core_ext | |
| parent | ad6f689bfff5148065a4d7eec1cf5d15da4e41c4 (diff) | |
| parent | e58a2dff70240d0b7634636a54a379e78cada3be (diff) | |
| download | rails-8478b0ca0b90bcf4210bf82938d73112d2e6b010.tar.gz rails-8478b0ca0b90bcf4210bf82938d73112d2e6b010.tar.bz2 rails-8478b0ca0b90bcf4210bf82938d73112d2e6b010.zip | |
Merge pull request #4514 from brainopia/update_timezone_offets
Update time zone offset information
Diffstat (limited to 'activesupport/lib/active_support/core_ext')
| -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>. |