kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Fix $rails_rake_task global variable warning without replacing the value of $rails_rake_task if it is already set.

Browse source 
Fixes #4591.
This commit is contained in:
Jonathan Viney 2012-01-22 12:20:45 +13:00
parent 15a9b2c0d6
commit 1d9357df3b
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
railties/lib/rails/application/finisher.rb
View file

@ -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