Only load rake tasks from tasks/**/*.rake and lib/tasks/**/*.rake in …

…plugins Previously, it was **/tasks/**/*.rake, and that loaded some paths that shouldn't be like: * vendor/plugins/admin_assistant/test_rails_app/lib/tasks/rspec.rake * vendor/plugins/will_paginate/test/tasks.rake Signed-off-by: Michael Koziarski <michael@koziarski.com>
rails · Oct 7, 2009 · 0f14d7b · 0f14d7b · fesplugas · Oct 7, 2009
1 parent 58f1443
commit 0f14d7b
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/railties/lib/tasks/rails.rb b/railties/lib/tasks/rails.rb
@@ -4,5 +4,6 @@
 Dir["#{File.dirname(__FILE__)}/*.rake"].each { |ext| load ext }
 
 # Load any custom rakefile extensions
-Dir["#{RAILS_ROOT}/vendor/plugins/*/**/tasks/**/*.rake"].sort.each { |ext| load ext }
+Dir["#{RAILS_ROOT}/vendor/plugins/*/tasks/**/*.rake"].sort.each { |ext| load ext }
+Dir["#{RAILS_ROOT}/vendor/plugins/*/lib/tasks/**/*.rake"].sort.each { |ext| load ext }
 Dir["#{RAILS_ROOT}/lib/tasks/**/*.rake"].sort.each { |ext| load ext }