aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2009-06-27 21:27:21 +0200
committerJosé Valim <jose.valim@gmail.com>2009-06-27 21:27:21 +0200
commit85ff67ce4c0e95de9b855af7f7e7fbab7f7726de (patch)
tree3eb1914ed2ac7261405df22015fc4b33578bbe3c /actionpack/lib/action_controller
parente375819b76ac04bc60fd516b15bbe42c093eb547 (diff)
parent085db5e128ad4ad8fd042776722c78e194c6d0a4 (diff)
downloadrails-85ff67ce4c0e95de9b855af7f7e7fbab7f7726de.tar.gz
rails-85ff67ce4c0e95de9b855af7f7e7fbab7f7726de.tar.bz2
rails-85ff67ce4c0e95de9b855af7f7e7fbab7f7726de.zip
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r--actionpack/lib/action_controller/base/filter_parameter_logging.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/base/filter_parameter_logging.rb b/actionpack/lib/action_controller/base/filter_parameter_logging.rb
index 26cd03f277..065e62a37f 100644
--- a/actionpack/lib/action_controller/base/filter_parameter_logging.rb
+++ b/actionpack/lib/action_controller/base/filter_parameter_logging.rb
@@ -43,6 +43,10 @@ module ActionController
filtered_parameters[key] = '[FILTERED]'
elsif value.is_a?(Hash)
filtered_parameters[key] = filter_parameters(value)
+ elsif value.is_a?(Array)
+ filtered_parameters[key] = value.collect do |item|
+ filter_parameters(item)
+ end
elsif block_given?
key = key.dup
value = value.dup if value