diff options
| author | Emilio Tagua <miloops@gmail.com> | 2009-07-03 12:17:23 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2009-07-03 12:17:23 -0300 |
| commit | 6d4b6a247ef4119f9657293c552ae71459a3665a (patch) | |
| tree | dc36a75ec42389bb4d6e81982a2a5b07c12c719e /railties/lib | |
| parent | cd424f0f320e6657091bee2265933b0f4b9ec65d (diff) | |
| parent | a4bdc00fec623f72592e663e6d7830eea0bc6ea4 (diff) | |
| download | rails-6d4b6a247ef4119f9657293c552ae71459a3665a.tar.gz rails-6d4b6a247ef4119f9657293c552ae71459a3665a.tar.bz2 rails-6d4b6a247ef4119f9657293c552ae71459a3665a.zip | |
Merge commit 'rails/master'
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/initializer.rb | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/railties/lib/initializer.rb b/railties/lib/initializer.rb index cd23158e98..560105670f 100644 --- a/railties/lib/initializer.rb +++ b/railties/lib/initializer.rb @@ -125,11 +125,8 @@ module Rails if Rails.vendor_rails? begin; require "rubygems"; rescue LoadError; return; end - stubs = %w(rails activesupport activerecord actionpack actionmailer activeresource) - stubs.reject! { |s| Gem.loaded_specs.key?(s) } - - stubs.each do |stub| - Gem.loaded_specs[stub] = Gem::Specification.new do |s| + %w(rails activesupport activerecord actionpack actionmailer activeresource).each do |stub| + Gem.loaded_specs[stub] ||= Gem::Specification.new do |s| s.name = stub s.version = Rails::VERSION::STRING s.loaded_from = "" |