diff options
| author | Carl Lerche <carllerche@mac.com> | 2009-12-31 13:11:54 -0800 |
|---|---|---|
| committer | Carl Lerche <carllerche@mac.com> | 2009-12-31 13:12:52 -0800 |
| commit | ae7ada1fde1648a5c81b9e6adf74d515e0bbe0a5 (patch) | |
| tree | 385b3655a8b8ef5355e4c85f7af81edfab5ef777 /railties/lib/rails/application.rb | |
| parent | e749424dfa38a0300a621b772eae96f9cc5d2555 (diff) | |
| download | rails-ae7ada1fde1648a5c81b9e6adf74d515e0bbe0a5.tar.gz rails-ae7ada1fde1648a5c81b9e6adf74d515e0bbe0a5.tar.bz2 rails-ae7ada1fde1648a5c81b9e6adf74d515e0bbe0a5.zip | |
Some railties cleanup:
* Rename <framework>/rails.rb -> <framework>/railtie.rb
* Rails::Plugin -> Rails::Railtie
* Rails::Plugin::Vendored -> Rails::Plugin
Diffstat (limited to 'railties/lib/rails/application.rb')
| -rw-r--r-- | railties/lib/rails/application.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb index 88f10727c5..457eef648c 100644 --- a/railties/lib/rails/application.rb +++ b/railties/lib/rails/application.rb @@ -92,8 +92,8 @@ 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) }.map { |p| p.new } + - Plugin::Vendored.all(config.plugins || [:all], config.paths.vendor.plugins) + Railtie.plugins.select { |p| plugin_names.include?(:all) || plugin_names.include?(p.plugin_name) }.map { |p| p.new } + + Plugin.all(config.plugins || [:all], config.paths.vendor.plugins) end end |