diff options
| author | Sam Pohlenz <sam@sampohlenz.com> | 2009-12-27 11:16:34 +1030 |
|---|---|---|
| committer | Carl Lerche <carllerche@mac.com> | 2009-12-29 14:45:43 -0800 |
| commit | cbce027669ded4e951af3124cae23d6707357aea (patch) | |
| tree | c65a7602001b6ba5b880e51e43003e374ecf2696 /railties/lib/rails/application.rb | |
| parent | 2e87196d14f0cb7b75a6b81cbd8a0810ed684de9 (diff) | |
| download | rails-cbce027669ded4e951af3124cae23d6707357aea.tar.gz rails-cbce027669ded4e951af3124cae23d6707357aea.tar.bz2 rails-cbce027669ded4e951af3124cae23d6707357aea.zip | |
Application object should instantiate non-vendored plugins
Signed-off-by: Carl Lerche <carllerche@mac.com>
Diffstat (limited to 'railties/lib/rails/application.rb')
| -rw-r--r-- | 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 2d0892282e..91c866d0c9 100644 --- a/railties/lib/rails/application.rb +++ b/railties/lib/rails/application.rb @@ -98,7 +98,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 |