diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2010-01-17 04:21:35 -0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-01-20 15:02:13 +0100 |
| commit | d1ffc54c06fbacf46783f5ebc84bc125c9188fd1 (patch) | |
| tree | e4caaa29c2235a28d58b8a4a6655b99a47f7303b /railties | |
| parent | 6e26be69606c52dbccfad366661b455157c35be4 (diff) | |
| download | rails-d1ffc54c06fbacf46783f5ebc84bc125c9188fd1.tar.gz rails-d1ffc54c06fbacf46783f5ebc84bc125c9188fd1.tar.bz2 rails-d1ffc54c06fbacf46783f5ebc84bc125c9188fd1.zip | |
fixes the failure of config.plugins without :all option tests [#3718 status:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/rails/application.rb | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb index b92a7ff129..743681359c 100644 --- a/railties/lib/rails/application.rb +++ b/railties/lib/rails/application.rb @@ -93,13 +93,12 @@ module Rails initializers end - # TODO: Fix this method + # TODO: Fix this method. It loads all railties independent if :all is given + # or not, otherwise frameworks are never loaded. def plugins @plugins ||= begin 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) + Railtie.plugins.map(&:new) + Plugin.all(plugin_names, config.paths.vendor.plugins) end end |