diff options
| author | Andrew White <andyw@pixeltrix.co.uk> | 2013-07-09 15:50:14 +0100 |
|---|---|---|
| committer | Andrew White <andyw@pixeltrix.co.uk> | 2013-07-09 15:50:14 +0100 |
| commit | c42260a3251157070a1bafadd179e4441df8933e (patch) | |
| tree | 8956fc1318447c30a75305a829d7050d62a0b130 /activesupport/lib/active_support | |
| parent | 37d1e48dfe1d120053ea71090cd52314990b4978 (diff) | |
| download | rails-c42260a3251157070a1bafadd179e4441df8933e.tar.gz rails-c42260a3251157070a1bafadd179e4441df8933e.tar.bz2 rails-c42260a3251157070a1bafadd179e4441df8933e.zip | |
Return local time for backwards compatibility
Diffstat (limited to 'activesupport/lib/active_support')
| -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 20e7e0b303..c739cce223 100644 --- a/activesupport/lib/active_support/core_ext/time/calculations.rb +++ b/activesupport/lib/active_support/core_ext/time/calculations.rb @@ -39,7 +39,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 |