From aa1b32ae9774e3f2a95faa0ec9efdf295958106d Mon Sep 17 00:00:00 2001
From: Carl Lerche <carllerche@mac.com>
Date: Tue, 29 Dec 2009 10:49:01 -0800
Subject: Check to see if the plugin object responds to load_tasks
 (vendor/plugin/* does not yet) Fixes Sam Ruby's tests.

---
 railties/lib/rails/application.rb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'railties/lib/rails')

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
-- 
cgit v1.2.3