diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-09-24 17:21:14 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-09-24 17:21:14 -0700 |
| commit | 0039c0344c54423413728a92509b42fe7f37d90c (patch) | |
| tree | 3cf2cda5e1d08a4445356be73ff81a3e9180ee2f /activesupport/lib | |
| parent | f0dd77c6be6a86fe384bb0015151e0a497973d39 (diff) | |
| download | rails-0039c0344c54423413728a92509b42fe7f37d90c.tar.gz rails-0039c0344c54423413728a92509b42fe7f37d90c.tar.bz2 rails-0039c0344c54423413728a92509b42fe7f37d90c.zip | |
Avoid inadvertently loading an old tzinfo gem
Diffstat (limited to 'activesupport/lib')
| -rw-r--r-- | activesupport/lib/active_support/vendor.rb | 5 | ||||
| -rw-r--r-- | activesupport/lib/active_support/vendor/tzinfo.rb | 9 |
2 files changed, 5 insertions, 9 deletions
diff --git a/activesupport/lib/active_support/vendor.rb b/activesupport/lib/active_support/vendor.rb index 10dbfd9a77..5c79c6a420 100644 --- a/activesupport/lib/active_support/vendor.rb +++ b/activesupport/lib/active_support/vendor.rb @@ -12,11 +12,6 @@ if defined? Gem end begin - gem 'tzinfo', '~> 0.3.13' - rescue Gem::LoadError - end - - begin gem 'i18n', '~> 0.1.3' rescue Gem::LoadError end diff --git a/activesupport/lib/active_support/vendor/tzinfo.rb b/activesupport/lib/active_support/vendor/tzinfo.rb index 01fba6d632..cc4f086edf 100644 --- a/activesupport/lib/active_support/vendor/tzinfo.rb +++ b/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' |