From d40effb754271c2d8be881bc330d53d2e3d6247e Mon Sep 17 00:00:00 2001 From: Sam Pohlenz Date: Sun, 27 Dec 2009 11:16:34 +1030 Subject: [PATCH] Application object should instantiate non-vendored plugins --- railties/lib/rails/application.rb | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb index cd579a1..ebb16eb 100644 --- a/railties/lib/rails/application.rb +++ b/railties/lib/rails/application.rb @@ -90,7 +90,7 @@ module Rails def plugins @plugins ||= begin plugin_names = config.plugins || [:all] - Plugin.plugins.select { |p| plugin_names.include?(:all) || plugin_names.include?(p.plugin_name) } + + Plugin.plugins.select { |p| plugin_names.include?(:all) || plugin_names.include?(p.plugin_name) }.map { |p| p.new } + Plugin::Vendored.all(config.plugins || [:all], config.paths.vendor.plugins) end end -- 1.6.5.7