diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2010-01-11 14:01:28 -0800 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2010-01-11 14:01:28 -0800 |
| commit | 8cb594a2e1808cd7d93f3593afed0414016fc56f (patch) | |
| tree | 766eeb882eb4cfd9a6a13893a7b0ca7f35811650 /railties/lib/rails.rb | |
| parent | a9eebde8561df5c7c34669587c9e25e8baeeeabb (diff) | |
| download | rails-8cb594a2e1808cd7d93f3593afed0414016fc56f.tar.gz rails-8cb594a2e1808cd7d93f3593afed0414016fc56f.tar.bz2 rails-8cb594a2e1808cd7d93f3593afed0414016fc56f.zip | |
Get everyone running on Rails.env and fix the broken environment settings for script/console and script/dbconsole
Diffstat (limited to 'railties/lib/rails.rb')
| -rw-r--r-- | railties/lib/rails.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/railties/lib/rails.rb b/railties/lib/rails.rb index 41672325bd..c21434a100 100644 --- a/railties/lib/rails.rb +++ b/railties/lib/rails.rb @@ -29,8 +29,6 @@ else Encoding.default_external = Encoding::UTF_8 end -RAILS_ENV = (ENV["RAILS_ENV"] || ENV["RACK_ENV"] || "development").dup unless defined?(RAILS_ENV) - module Rails autoload :Bootstrap, 'rails/bootstrap' @@ -86,7 +84,7 @@ module Rails end def env - @_env ||= ActiveSupport::StringInquirer.new(RAILS_ENV) + @_env ||= ActiveSupport::StringInquirer.new(ENV["RAILS_ENV"] || ENV["RACK_ENV"] || "development") end def cache |