diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2009-05-16 17:13:58 +0200 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2009-05-16 17:13:58 +0200 |
| commit | 6be72a1e6287c5c098dd518ddc0467e473164869 (patch) | |
| tree | 89e7f6bf9ff6b7cf1ed5f2424991dc472e6a2c24 /actionpack/lib/action_controller/base/chained | |
| parent | c8fb22bc2933beb5c6cc4113380c8faf77d87ffe (diff) | |
| parent | a6d8ca0f0e65ce509793713cb1efe4ab721b9eb4 (diff) | |
| download | rails-6be72a1e6287c5c098dd518ddc0467e473164869.tar.gz rails-6be72a1e6287c5c098dd518ddc0467e473164869.tar.bz2 rails-6be72a1e6287c5c098dd518ddc0467e473164869.zip | |
Merge commit 'mainstream/master'
Diffstat (limited to 'actionpack/lib/action_controller/base/chained')
| -rw-r--r-- | actionpack/lib/action_controller/base/chained/filters.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/base/chained/filters.rb b/actionpack/lib/action_controller/base/chained/filters.rb index 9022b8b279..98fe306fd5 100644 --- a/actionpack/lib/action_controller/base/chained/filters.rb +++ b/actionpack/lib/action_controller/base/chained/filters.rb @@ -160,7 +160,7 @@ module ActionController #:nodoc: def convert_only_and_except_options_to_sets_of_strings(opts) [:only, :except].each do |key| if values = opts[key] - opts[key] = Array(values).map(&:to_s).to_set + opts[key] = Array(values).map {|val| val.to_s }.to_set end end end |