diff options
| author | Joshua Peek <josh@joshpeek.com> | 2010-01-05 23:37:40 -0600 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2010-01-05 23:37:40 -0600 |
| commit | bbe80ae6525ec0c3da22b8d3a598af4126db1a57 (patch) | |
| tree | d099ce88368a1d1baedb18a27f0a16f7c4fa91c7 /railties/lib/rails/application.rb | |
| parent | 10389a4c29c5b17083a7fa43b97334b4ea811ec8 (diff) | |
| download | rails-bbe80ae6525ec0c3da22b8d3a598af4126db1a57.tar.gz rails-bbe80ae6525ec0c3da22b8d3a598af4126db1a57.tar.bz2 rails-bbe80ae6525ec0c3da22b8d3a598af4126db1a57.zip | |
config.plugins should still work with an array of strings
Diffstat (limited to 'railties/lib/rails/application.rb')
| -rw-r--r-- | railties/lib/rails/application.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb index 3fb4b723ab..b3b48194d4 100644 --- a/railties/lib/rails/application.rb +++ b/railties/lib/rails/application.rb @@ -91,9 +91,10 @@ module Rails # TODO: Fix this method def plugins @plugins ||= begin - plugin_names = config.plugins || [:all] - 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) + plugin_names = (config.plugins || [:all]).map { |p| p.to_sym } + Railtie.plugins.select { |p| + plugin_names.include?(:all) || plugin_names.include?(p.plugin_name) + }.map { |p| p.new } + Plugin.all(plugin_names, config.paths.vendor.plugins) end end |