Refactor identifying generator's destination root

5f005924 · Stefan Sprenger · a0ee2270 · 5f005924
隐藏空白更改
内联并排

Showing with 2 addition and 5 deletion

railties/lib/rails/commands/generate.rb railties/lib/rails/commands/generate.rb +2 -5

未找到文件。
--- a/railties/lib/rails/commands/generate.rb
+++ b/railties/lib/rails/commands/generate.rb
@@ -8,8 +8,5 @@
 name = ARGV.shift
-if defined?(ENGINE_ROOT)
+root = defined?(ENGINE_ROOT) ? ENGINE_ROOT : Rails.root
-  Rails::Generators.invoke name, ARGV, :behavior => :invoke, :destination_root => ENGINE_ROOT
+Rails::Generators.invoke name, ARGV, :behavior => :invoke, :destination_root => root
-else
-  Rails::Generators.invoke name, ARGV, :behavior => :invoke, :destination_root => Rails.root
-end