Permalink
Browse files

Fix `$rails_rake_task` global variable warning without replacing the …

…value of $rails_rake_task if it is already set.


Fixes #4591.

Signed-off-by: José Valim <jose.valim@gmail.com>
  • Loading branch information...
jviney authored and josevalim committed Jan 21, 2012
1 parent d5dde37 commit 9ab290482284afbdc6830d84b33da03069073d4a
Showing with 1 addition and 2 deletions.
  1. +1 −2 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 Finisher
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

0 comments on commit 9ab2904

Please sign in to comment.