diff options
Diffstat (limited to 'activesupport/lib/active_support/values/time_zone.rb')
| -rw-r--r-- | activesupport/lib/active_support/values/time_zone.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/activesupport/lib/active_support/values/time_zone.rb b/activesupport/lib/active_support/values/time_zone.rb index 9db6bbafca..bc4fb77f9c 100644 --- a/activesupport/lib/active_support/values/time_zone.rb +++ b/activesupport/lib/active_support/values/time_zone.rb @@ -317,9 +317,7 @@ module ActiveSupport # TODO: Preload instead of lazy load for thread safety def self.find_tzinfo(name) require 'tzinfo' unless defined?(::TZInfo) - ::TZInfo::Timezone.get(MAPPING[name] || name) - rescue TZInfo::InvalidTimezoneIdentifier - nil + ::TZInfo::TimezoneProxy.new(MAPPING[name] || name) end unless const_defined?(:ZONES) |