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:17:29 -0800 |
| commit | e0fe62b926956bc4ae6a3219c2c8473431007531 (patch) | |
| tree | 1ab7d4e813e45787ef024a94229faa1a80518b1f /activesupport/lib | |
| parent | dc826f9977650c105e9bfd308d6d4fc71bb6ec6e (diff) | |
| download | rails-e0fe62b926956bc4ae6a3219c2c8473431007531.tar.gz rails-e0fe62b926956bc4ae6a3219c2c8473431007531.tar.bz2 rails-e0fe62b926956bc4ae6a3219c2c8473431007531.zip | |
Merge pull request #4514 from brainopia/update_timezone_offets
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 48cf1a435d..6f3fd416c1 100644 --- a/activesupport/lib/active_support/core_ext/date_time/calculations.rb +++ b/activesupport/lib/active_support/core_ext/date_time/calculations.rb @@ -4,7 +4,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>. |