aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2007-05-21 23:01:17 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2007-05-21 23:01:17 +0000
commit8ba22a690c65009d0f64e32cd316bc1ca45492c7 (patch)
tree0ba6c7d868b035a6b21c22ca90134ba89af170ed /actionpack/lib
parentf6edfa3553b175e1fc619a086551c2fb27ff72a3 (diff)
downloadrails-8ba22a690c65009d0f64e32cd316bc1ca45492c7.tar.gz
rails-8ba22a690c65009d0f64e32cd316bc1ca45492c7.tar.bz2
rails-8ba22a690c65009d0f64e32cd316bc1ca45492c7.zip
Fix filtered parameter logging with nil parameter values. Closes #8422.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6802 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib')
-rwxr-xr-xactionpack/lib/action_controller/base.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index 6ba5e141ea..cfd60ac6bf 100755
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -441,7 +441,8 @@ module ActionController #:nodoc:
elsif value.is_a?(Hash)
filtered_parameters[key] = filter_parameters(value)
elsif block_given?
- key, value = key.dup, value.dup
+ key = key.dup
+ value = value.dup if value
yield key, value
filtered_parameters[key] = value
else