From de42f26df787af135baef65f59aa145873714aa5 Mon Sep 17 00:00:00 2001
From: Jamis Buck <jamis@37signals.com>
Date: Wed, 12 Oct 2005 12:44:03 +0000
Subject: Make sure ENV['RAILS_ENV'] and RAILS_ENV are kept in sync

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2539 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
---
 railties/lib/commands/runner.rb | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'railties')

diff --git a/railties/lib/commands/runner.rb b/railties/lib/commands/runner.rb
index c7a70a1b0b..49827c3812 100644
--- a/railties/lib/commands/runner.rb
+++ b/railties/lib/commands/runner.rb
@@ -20,11 +20,8 @@ ARGV.options do |opts|
   opts.parse!
 end
 
-if defined?(RAILS_ENV)
-  RAILS_ENV.replace(options[:environment])
-else
-  ENV["RAILS_ENV"] = options[:environment]
-end
+ENV["RAILS_ENV"] = options[:environment]
+RAILS_ENV.replace(options[:environment]) if defined?(RAILS_ENV)
 
 require RAILS_ROOT + '/config/environment'
 eval(ARGV.first)
-- 
cgit v1.2.3