diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-01-19 08:46:43 -0800 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-01-19 08:46:43 -0800 |
commit | af5edef9f887ea4c63b214b3130c23a16a08e179 (patch) | |
tree | 1015b42e13d2b1a0233ba4b467b90281c08e79bf /actionpack/lib/action_controller/railtie.rb | |
parent | 0d65969e6869f01bf6f459add3635497ed630156 (diff) | |
parent | 130370b1c872e9c7645e1c3cc26365d9dc4d90b1 (diff) | |
download | rails-af5edef9f887ea4c63b214b3130c23a16a08e179.tar.gz rails-af5edef9f887ea4c63b214b3130c23a16a08e179.tar.bz2 rails-af5edef9f887ea4c63b214b3130c23a16a08e179.zip |
Merge pull request #8999 from thomasfedb/raise_or_log_unpermitted_params
Raise or log unpermitted params.
Diffstat (limited to 'actionpack/lib/action_controller/railtie.rb')
-rw-r--r-- | actionpack/lib/action_controller/railtie.rb | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/actionpack/lib/action_controller/railtie.rb b/actionpack/lib/action_controller/railtie.rb index 3e44155f73..bd012965c3 100644 --- a/actionpack/lib/action_controller/railtie.rb +++ b/actionpack/lib/action_controller/railtie.rb @@ -21,21 +21,24 @@ module ActionController initializer "action_controller.parameters_config" do |app| ActionController::Parameters.permit_all_parameters = app.config.action_controller.delete(:permit_all_parameters) { false } + ActionController::Parameters.action_on_unpermitted = app.config.action_controller.action_on_unpermitted_params end initializer "action_controller.set_configs" do |app| paths = app.config.paths options = app.config.action_controller - options.logger ||= Rails.logger - options.cache_store ||= Rails.cache + options.logger ||= Rails.logger + options.cache_store ||= Rails.cache - options.javascripts_dir ||= paths["public/javascripts"].first - options.stylesheets_dir ||= paths["public/stylesheets"].first + options.javascripts_dir ||= paths["public/javascripts"].first + options.stylesheets_dir ||= paths["public/stylesheets"].first # Ensure readers methods get compiled - options.asset_host ||= app.config.asset_host - options.relative_url_root ||= app.config.relative_url_root + options.asset_host ||= app.config.asset_host + options.relative_url_root ||= app.config.relative_url_root + + options.action_on_unpermitted_params ||= (Rails.env.test? || Rails.env.development?) ? :log : false ActiveSupport.on_load(:action_controller) do include app.routes.mounted_helpers |