aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2005-09-30 11:11:21 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2005-09-30 11:11:21 +0000
commit3b108e7d35768c37810b9ec4c012db814bc09c1b (patch)
treeef9ee88dd846f2e888d50817584442927168be5f
parent562b69829d9f11349bb57aec0559e360069a06e6 (diff)
downloadrails-3b108e7d35768c37810b9ec4c012db814bc09c1b.tar.gz
rails-3b108e7d35768c37810b9ec4c012db814bc09c1b.tar.bz2
rails-3b108e7d35768c37810b9ec4c012db814bc09c1b.zip
Dont redefine RAILS_ENV once set
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2425 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
-rw-r--r--railties/lib/initializer.rb4
1 files changed, 1 insertions, 3 deletions
diff --git a/railties/lib/initializer.rb b/railties/lib/initializer.rb
index f942e97694..5e1e38e33d 100644
--- a/railties/lib/initializer.rb
+++ b/railties/lib/initializer.rb
@@ -1,8 +1,6 @@
require 'logger'
-old_verbose, $VERBOSE = $VERBOSE, nil
-RAILS_ENV = ENV['RAILS_ENV'] || 'development'
-$VERBOSE = old_verbose
+RAILS_ENV = ENV['RAILS_ENV'] || 'development' unless defined?(RAILS_ENV)
module Rails
# The Initializer is responsible for processing the Rails configuration, such as setting the $LOAD_PATH, requiring the