aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails
diff options
context:
space:
mode:
authorCarl Lerche <carllerche@mac.com>2009-12-29 10:49:01 -0800
committerCarl Lerche <carllerche@mac.com>2009-12-29 10:49:12 -0800
commitaa1b32ae9774e3f2a95faa0ec9efdf295958106d (patch)
tree40890a393c2603b247900b99a91759c62d98ad15 /railties/lib/rails
parent0dea509817a17fd4b64196cb83acbcef4818cb54 (diff)
downloadrails-aa1b32ae9774e3f2a95faa0ec9efdf295958106d.tar.gz
rails-aa1b32ae9774e3f2a95faa0ec9efdf295958106d.tar.bz2
rails-aa1b32ae9774e3f2a95faa0ec9efdf295958106d.zip
Check to see if the plugin object responds to load_tasks (vendor/plugin/* does not yet) Fixes Sam Ruby's tests.
Diffstat (limited to 'railties/lib/rails')
-rw-r--r--railties/lib/rails/application.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index 4c1f36f537..2d0892282e 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -73,7 +73,10 @@ module Rails
def load_tasks
require "rails/tasks"
# Load all extension rake tasks
- plugins.each(&:load_tasks)
+ # TODO: Make all plugin objects respond to :load_tasks
+ plugins.each do |plugin|
+ plugin.load_tasks if plugin.respond_to? :load_tasks
+ end
# Load all plugin tasks
Dir["#{root}/vendor/plugins/*/**/tasks/**/*.rake"].sort.each { |ext| load ext }
# Load all application tasks