aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@plataformatec.com.br>2013-03-18 21:00:39 -0600
committerJosé Valim <jose.valim@plataformatec.com.br>2013-03-18 21:00:39 -0600
commit862389c9537dbb6f65fd26c4325e07607ed437b5 (patch)
tree47a90460c74e710c0d0842224fef544e59083267 /railties
parent111611b511c27ec29be6a8837de6d8f25cded5a7 (diff)
downloadrails-862389c9537dbb6f65fd26c4325e07607ed437b5.tar.gz
rails-862389c9537dbb6f65fd26c4325e07607ed437b5.tar.bz2
rails-862389c9537dbb6f65fd26c4325e07607ed437b5.zip
Use @app_env_config instead of @env_config
Check pull request #9789 for more information.
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/rails/application.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index 2417bdca21..0ebb8e0016 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -134,7 +134,7 @@ module Rails
# * "action_dispatch.encrypted_signed_cookie_salt" => config.action_dispatch.encrypted_signed_cookie_salt
#
def env_config
- @env_config ||= begin
+ @app_env_config ||= begin
if config.secret_key_base.nil?
ActiveSupport::Deprecation.warn "You didn't set config.secret_key_base in config/initializers/secret_token.rb file. " +
"This should be used instead of the old deprecated config.secret_token in order to use the new EncryptedCookieStore. " +