diff options
author | José Valim <jose.valim@gmail.com> | 2010-04-05 10:52:47 +0200 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2010-04-05 12:00:24 +0200 |
commit | 6690d662920f0db854f7303cd2a5a36c72299199 (patch) | |
tree | 9e531ce7d2945b5eb0ce06e63277cc06361b37c0 /railties/lib/rails/application.rb | |
parent | 5c8b4c6e231257bc08d32722e098927885e5e74d (diff) | |
download | rails-6690d662920f0db854f7303cd2a5a36c72299199.tar.gz rails-6690d662920f0db854f7303cd2a5a36c72299199.tar.bz2 rails-6690d662920f0db854f7303cd2a5a36c72299199.zip |
Rename config.cookie_secret to config.secret_token and pass it as configuration in request.env. This is another step forward removing global configuration.
Diffstat (limited to 'railties/lib/rails/application.rb')
-rw-r--r-- | railties/lib/rails/application.rb | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb index 0084309ea4..38a5aa8ca3 100644 --- a/railties/lib/rails/application.rb +++ b/railties/lib/rails/application.rb @@ -1,3 +1,4 @@ +require 'active_support/core_ext/hash/reverse_merge' require 'fileutils' require 'rails/plugin' require 'rails/engine' @@ -128,8 +129,14 @@ module Rails end def call(env) - env["action_dispatch.parameter_filter"] = config.filter_parameters - app.call(env) + app.call(env.reverse_merge!(env_defaults)) + end + + def env_defaults + @env_defaults ||= { + "action_dispatch.parameter_filter" => config.filter_parameters, + "action_dispatch.secret_token" => config.secret_token + } end def initializers |