From b775987e72260233c66080483b3c964f9549d094 Mon Sep 17 00:00:00 2001 From: Andrew White Date: Tue, 9 Jul 2013 15:40:59 +0100 Subject: Return local time for backwards compatibility --- activesupport/lib/active_support/core_ext/time/calculations.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'activesupport/lib') 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 -- cgit v1.2.3