diff options
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/initializer.rb | 5 | ||||
| -rw-r--r-- | railties/lib/rails/gem_dependency.rb | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/railties/lib/initializer.rb b/railties/lib/initializer.rb index 4be7b06f93..ec3e1d79d6 100644 --- a/railties/lib/initializer.rb +++ b/railties/lib/initializer.rb @@ -102,6 +102,11 @@ module Rails load_gems load_plugins + + # pick up any gems that plugins depend on + add_gem_load_paths + load_gems + load_application_initializers # the framework is now fully initialized diff --git a/railties/lib/rails/gem_dependency.rb b/railties/lib/rails/gem_dependency.rb index ed16464887..2ffacd17b6 100644 --- a/railties/lib/rails/gem_dependency.rb +++ b/railties/lib/rails/gem_dependency.rb @@ -35,7 +35,7 @@ module Rails end def load - return if @load_paths_added == false + return if @loaded || @load_paths_added == false require(@lib || @name) @loaded = true rescue LoadError |