From 39ebd6eb2b6c90756514798450eb15bdfec67be6 Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Tue, 9 Feb 2010 08:40:06 -0800
Subject: rails runner loads environment after parsing command-line options

---
 railties/lib/rails/commands.rb        | 2 --
 railties/lib/rails/commands/runner.rb | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/commands.rb b/railties/lib/rails/commands.rb
index 5b73577e36..991d2a0205 100644
--- a/railties/lib/rails/commands.rb
+++ b/railties/lib/rails/commands.rb
@@ -58,8 +58,6 @@ when 'plugin'
   require 'rails/commands/plugin'
 when 'runner'
   require 'rails/commands/runner'
-  require ENV_PATH
-
 
 when '--help', '-h'
   puts HELP_TEXT
diff --git a/railties/lib/rails/commands/runner.rb b/railties/lib/rails/commands/runner.rb
index 606e04483f..1570b9ab0d 100644
--- a/railties/lib/rails/commands/runner.rb
+++ b/railties/lib/rails/commands/runner.rb
@@ -35,6 +35,8 @@ ARGV.delete(code_or_file)
 
 ENV["RAILS_ENV"] = options[:environment]
 
+require ENV_PATH
+
 begin
   if code_or_file.nil?
     $stderr.puts "Run '#{$0} -h' for help."
-- 
cgit v1.2.3