aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2010-03-26 13:24:02 +0100
committerJosé Valim <jose.valim@gmail.com>2010-03-26 13:24:08 +0100
commit5231e4e8c51333acd62d2e07a0f73cf0e0169fc2 (patch)
tree5babbcf16488b99b90a8d3ce39a7f65c52872a66 /activesupport/lib
parentc7cc9583689d63d342983d739ccf5c4e94233a48 (diff)
downloadrails-5231e4e8c51333acd62d2e07a0f73cf0e0169fc2.tar.gz
rails-5231e4e8c51333acd62d2e07a0f73cf0e0169fc2.tar.bz2
rails-5231e4e8c51333acd62d2e07a0f73cf0e0169fc2.zip
Ensure to reference the proper TZInfo namespace [#4268 state:resolved].
Diffstat (limited to 'activesupport/lib')
-rw-r--r--activesupport/lib/active_support/values/time_zone.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/values/time_zone.rb b/activesupport/lib/active_support/values/time_zone.rb
index 4db3dd1705..3cb4d89e02 100644
--- a/activesupport/lib/active_support/values/time_zone.rb
+++ b/activesupport/lib/active_support/values/time_zone.rb
@@ -305,8 +305,8 @@ module ActiveSupport
# TODO: Preload instead of lazy load for thread safety
def tzinfo
- require 'tzinfo' unless defined?(TZInfo)
- @tzinfo ||= TZInfo::Timezone.get(MAPPING[name])
+ require 'tzinfo' unless defined?(::TZInfo)
+ @tzinfo ||= ::TZInfo::Timezone.get(MAPPING[name])
end
unless const_defined?(:ZONES)