aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/values
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2008-11-23 16:08:00 -0800
committerJeremy Kemper <jeremy@bitsweat.net>2008-11-23 16:08:00 -0800
commit1250faa858c825c7cb1e673dbc476b1629b154b2 (patch)
tree0678b923db3c7d273f50d0a48ddaa5d8fb085f2f /activesupport/lib/active_support/values
parent0eca8111f26efe8f116a18cb86631d08f66e09d9 (diff)
downloadrails-1250faa858c825c7cb1e673dbc476b1629b154b2.tar.gz
rails-1250faa858c825c7cb1e673dbc476b1629b154b2.tar.bz2
rails-1250faa858c825c7cb1e673dbc476b1629b154b2.zip
Lazy-require tzinfo for TimeZone
Diffstat (limited to 'activesupport/lib/active_support/values')
-rw-r--r--activesupport/lib/active_support/values/time_zone.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/activesupport/lib/active_support/values/time_zone.rb b/activesupport/lib/active_support/values/time_zone.rb
index 1d87fa64b5..836f469df7 100644
--- a/activesupport/lib/active_support/values/time_zone.rb
+++ b/activesupport/lib/active_support/values/time_zone.rb
@@ -288,6 +288,7 @@ module ActiveSupport
# TODO: Preload instead of lazy load for thread safety
def tzinfo
+ require 'tzinfo' unless defined?(TZInfo)
@tzinfo ||= TZInfo::Timezone.get(MAPPING[name])
end