Share the common implementation between apps and engines.

1 files changed, 7 insertions, 12 deletions

diff --git a/railties/lib/rails/command/actions.rb b/railties/lib/rails/command/actions.rb
index fb80e9d997..8fda1c87c6 100644
--- a/railties/lib/rails/command/actions.rb
+++ b/railties/lib/rails/command/actions.rb
@@ -8,16 +8,16 @@ module Rails
         Dir.chdir(File.expand_path("../../", APP_PATH)) unless File.exist?(File.expand_path("config.ru"))
       end
 
-      if defined?(ENGINE_PATH)
-        def require_application_and_environment!
-          require ENGINE_PATH
+      def require_application_and_environment!
+        require ENGINE_PATH if defined?(ENGINE_PATH)
 
-          if defined?(APP_PATH)
-            require APP_PATH
-            Rails.application.require_environment!
-          end
+        if defined?(APP_PATH)
+          require APP_PATH
+          Rails.application.require_environment!
         end
+      end
 
+      if defined?(ENGINE_PATH)
         def load_tasks
           Rake.application.init("rails")
           Rake.application.load_rakefile
@@ -29,11 +29,6 @@ module Rails
           engine.load_generators
         end
       else
-        def require_application_and_environment!
-          require APP_PATH
-          Rails.application.require_environment!
-        end
-
         def load_tasks
           Rails.application.load_tasks
         end