diff options
| author | Andrew White <andyw@pixeltrix.co.uk> | 2013-07-09 15:40:59 +0100 |
|---|---|---|
| committer | Andrew White <andyw@pixeltrix.co.uk> | 2013-07-09 15:40:59 +0100 |
| commit | b775987e72260233c66080483b3c964f9549d094 (patch) | |
| tree | 19103789c23b3bbbd791346d4351b2eb5a486efc /activesupport/lib | |
| parent | ccad803bf44fe30602a041ff0ab1cbe985bc3840 (diff) | |
| download | rails-b775987e72260233c66080483b3c964f9549d094.tar.gz rails-b775987e72260233c66080483b3c964f9549d094.tar.bz2 rails-b775987e72260233c66080483b3c964f9549d094.zip | |
Return local time for backwards compatibility
Diffstat (limited to 'activesupport/lib')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/time/calculations.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/core_ext/time/calculations.rb b/activesupport/lib/active_support/core_ext/time/calculations.rb index 9663edb0ad..0383a6a963 100644 --- a/activesupport/lib/active_support/core_ext/time/calculations.rb +++ b/activesupport/lib/active_support/core_ext/time/calculations.rb @@ -55,7 +55,7 @@ class Time time_or_number = args.first if time_or_number.is_a?(ActiveSupport::TimeWithZone) || time_or_number.is_a?(DateTime) - at_without_coercion(time_or_number.to_f).getlocal(time_or_number.utc_offset) + at_without_coercion(time_or_number.to_f).getlocal else at_without_coercion(time_or_number) end |