From 83f257fc4862642af29056cb5b7dfef6e1303754 Mon Sep 17 00:00:00 2001
From: Patrick Quinn <patrick@patrickquinn.net>
Date: Fri, 20 May 2011 20:02:20 -0400
Subject: [PATCH] Make Rake::DSL methods available within Railtie rake_tasks
 block

Fixes incompatibility introduced by Rake 0.9.0
---
 railties/lib/rails/application.rb | 10 ++++++----
 railties/lib/rails/railtie.rb     |  1 +
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index f72dc8d02dd21..c39bcfc4161bf 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -211,10 +211,12 @@ def default_middleware_stack
     end
 
     def initialize_tasks
-      require "rails/tasks"
-      task :environment do
-        $rails_rake_task = true
-        require_environment!
+      self.class.rake_tasks do
+        require "rails/tasks"
+        task :environment do
+          $rails_rake_task = true
+          require_environment!
+        end
       end
     end
 
diff --git a/railties/lib/rails/railtie.rb b/railties/lib/rails/railtie.rb
index a2a7df156e718..109e87806f0a7 100644
--- a/railties/lib/rails/railtie.rb
+++ b/railties/lib/rails/railtie.rb
@@ -181,6 +181,7 @@ def load_console
     end
 
     def load_tasks
+      extend Rake::DSL if defined? Rake::DSL
       self.class.rake_tasks.each(&:call)
     end