diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-12-21 15:31:15 -0800 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-12-21 15:31:15 -0800 |
| commit | bc8d2f6a628dedeb091e4262a3a1b59d0749b1a6 (patch) | |
| tree | 52d61165fac5f1c410b9918afa30289180833c48 /railties/lib | |
| parent | 625699aa6c1122a0158f421e43aa8b1033586035 (diff) | |
| parent | 6b692ee37c08f1abee8c9b8a12f9b7f1234afb00 (diff) | |
| download | rails-bc8d2f6a628dedeb091e4262a3a1b59d0749b1a6.tar.gz rails-bc8d2f6a628dedeb091e4262a3a1b59d0749b1a6.tar.bz2 rails-bc8d2f6a628dedeb091e4262a3a1b59d0749b1a6.zip | |
Merge pull request #8574 from alindeman/rails_env
Correctly shows RAILS_ENV=development even when ENV['RAILS_ENV'] is not set (e.g., in Pow)
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/rails.rb | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/railties/lib/rails.rb b/railties/lib/rails.rb index 2797205334..ac8e84e366 100644 --- a/railties/lib/rails.rb +++ b/railties/lib/rails.rb @@ -72,10 +72,7 @@ module Rails end def env - @_env ||= begin - ENV["RAILS_ENV"] ||= ENV["RACK_ENV"] || "development" - ActiveSupport::StringInquirer.new(ENV["RAILS_ENV"]) - end + @_env ||= ActiveSupport::StringInquirer.new(ENV["RAILS_ENV"] || ENV["RACK_ENV"] || "development") end def env=(environment) |