From 1d9357df3b30a3aa5a2418b0fe68aeacbb111500 Mon Sep 17 00:00:00 2001 From: Jonathan Viney Date: Sun, 22 Jan 2012 12:20:45 +1300 Subject: [PATCH] Fix `$rails_rake_task` global variable warning without replacing the value of $rails_rake_task if it is already set. Fixes #4591. --- railties/lib/rails/application/finisher.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/railties/lib/rails/application/finisher.rb b/railties/lib/rails/application/finisher.rb index b9944bed26..7da495211d 100644 --- a/railties/lib/rails/application/finisher.rb +++ b/railties/lib/rails/application/finisher.rb @@ -2,7 +2,6 @@ module Rails class Application module Finisher include Initializable - $rails_rake_task = nil initializer :add_generator_templates do config.generators.templates.unshift(*paths["lib/templates"].existent) @@ -49,7 +48,7 @@ module Rails end initializer :eager_load! do - if config.cache_classes && !$rails_rake_task + if config.cache_classes && !(defined?($rails_rake_task) && $rails_rake_task) ActiveSupport.run_load_hooks(:before_eager_load, self) eager_load! end