diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-10-31 17:18:45 -0700 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-10-31 17:18:45 -0700 |
| commit | 1e89e43f66e1d3d993475a717ac16e3db2cb76ee (patch) | |
| tree | cae75db71b555c52e6f37595f229c75100df6181 /railties/lib | |
| parent | d3494903719682abc0948bef290af0d3d7b5a440 (diff) | |
| parent | b3125c89f42968bec6ee0b92ab93e36dbc36d5c3 (diff) | |
| download | rails-1e89e43f66e1d3d993475a717ac16e3db2cb76ee.tar.gz rails-1e89e43f66e1d3d993475a717ac16e3db2cb76ee.tar.bz2 rails-1e89e43f66e1d3d993475a717ac16e3db2cb76ee.zip | |
Merge pull request #8026 from steveklabnik/issue_8025
Make sure that RAILS_ENV is set when accessing Rails.env
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/rails.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/railties/lib/rails.rb b/railties/lib/rails.rb index dd51a6fb01..6bf2d8db20 100644 --- a/railties/lib/rails.rb +++ b/railties/lib/rails.rb @@ -85,7 +85,10 @@ module Rails end def env - @_env ||= ActiveSupport::StringInquirer.new(ENV["RAILS_ENV"] || ENV["RACK_ENV"] || "development") + @_env ||= begin + ENV["RAILS_ENV"] ||= ENV["RACK_ENV"] || "development" + ActiveSupport::StringInquirer.new(ENV["RAILS_ENV"]) + end end def env=(environment) |