aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib
diff options
context:
space:
mode:
Diffstat (limited to 'railties/lib')
-rw-r--r--railties/lib/rails.rb5
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)