diff options
Diffstat (limited to 'activesupport/lib/active_support/core_ext/time/zones.rb')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/time/zones.rb | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/core_ext/time/zones.rb b/activesupport/lib/active_support/core_ext/time/zones.rb index e7610d144f..3096427904 100644 --- a/activesupport/lib/active_support/core_ext/time/zones.rb +++ b/activesupport/lib/active_support/core_ext/time/zones.rb @@ -38,8 +38,15 @@ module ActiveSupport #:nodoc: private def get_zone(time_zone) - return time_zone if time_zone.nil? || time_zone.respond_to?(:period_for_local) - TimeZone[time_zone] + return time_zone if time_zone.nil? || time_zone.is_a?(TimeZone) + # lookup timezone based on identifier (unless we've been passed a TZInfo::Timezone) + unless time_zone.respond_to?(:period_for_local) + time_zone = TimeZone[time_zone] || TZInfo::Timezone.get(time_zone) rescue nil + end + # Return if a TimeZone instance, or wrap in a TimeZone instance if a TZInfo::Timezone + if time_zone + time_zone.is_a?(TimeZone) ? time_zone : TimeZone.create(time_zone.name, nil, time_zone) + end end end |