Permalink
Browse files

Avoid inadvertently loading an old tzinfo gem

  • Loading branch information...
1 parent f0dd77c commit 0039c0344c54423413728a92509b42fe7f37d90c @jeremy jeremy committed Sep 25, 2009
Showing with 5 additions and 9 deletions.
  1. +0 −5 activesupport/lib/active_support/vendor.rb
  2. +5 −4 activesupport/lib/active_support/vendor/tzinfo.rb
View
5 activesupport/lib/active_support/vendor.rb
@@ -12,11 +12,6 @@
end
begin
- gem 'tzinfo', '~> 0.3.13'
- rescue Gem::LoadError
- end
-
- begin
gem 'i18n', '~> 0.1.3'
rescue Gem::LoadError
end
View
9 activesupport/lib/active_support/vendor/tzinfo.rb
@@ -1,6 +1,7 @@
begin
- require 'tzinfo'
-rescue LoadError
- $:.unshift File.expand_path(File.join(File.dirname(__FILE__), 'tzinfo-0.3.13', 'lib'))
- retry
+ gem 'tzinfo', '~> 0.3.13'
+rescue Gem::LoadError
+ $LOAD_PATH.unshift File.expand_path("#{File.dirname(__FILE__)}/tzinfo-0.3.13/lib")
end
+
+require 'tzinfo'

0 comments on commit 0039c03

Please sign in to comment.