diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-09-18 14:43:27 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-09-18 14:43:27 -0700 |
| commit | 96e713b02bc46859cef31c20e506fdccb397112f (patch) | |
| tree | f12d81c216019ac2578f46ef71dd7ec0281db8ba | |
| parent | 1e7b8d3a227846d488d16cd3fe9de13aa2f19c7c (diff) | |
| parent | 3a34d9a64071edfb3958ad0dfe549b19ce89cd73 (diff) | |
| download | rails-96e713b02bc46859cef31c20e506fdccb397112f.tar.gz rails-96e713b02bc46859cef31c20e506fdccb397112f.tar.bz2 rails-96e713b02bc46859cef31c20e506fdccb397112f.zip | |
Merge pull request #7691 from lest/patch-1
fix shadowing outer local variable warning
| -rw-r--r-- | actionpack/lib/action_controller/metal/strong_parameters.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller/metal/strong_parameters.rb b/actionpack/lib/action_controller/metal/strong_parameters.rb index c3c1921706..ebbacfc455 100644 --- a/actionpack/lib/action_controller/metal/strong_parameters.rb +++ b/actionpack/lib/action_controller/metal/strong_parameters.rb @@ -41,12 +41,12 @@ module ActionController when Symbol, String then params[filter] = self[filter] if has_key?(filter) when Hash then - self.slice(*filter.keys).each do |key, value| - return unless value + self.slice(*filter.keys).each do |key, values| + return unless values key = key.to_sym - params[key] = each_element(value) do |value| + params[key] = each_element(values) do |value| # filters are a Hash, so we expect value to be a Hash too next if filter.is_a?(Hash) && !value.is_a?(Hash) |