Merge pull request #8026 from steveklabnik/issue_8025

Make sure that RAILS_ENV is set when accessing Rails.env

railties/CHANGELOG.md

 ## Rails 4.0.0 (unreleased) ##
 
+*   Ensure that RAILS_ENV is set when accessing Rails.env *Steve Klabnik*
+
 *   Don't eager-load app/assets and app/views *Elia Schito*
 
 *   Add `.rake` to list of file extensions included by `rake notes` and `rake notes:custom`. *Brent J. Nordquist*

railties/lib/rails.rb

@@ -85,7 +85,10 @@ def root
     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)