diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-12-28 16:28:26 -0800 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-12-28 17:36:08 -0800 |
| commit | 9a650a6547d2a83004db1bf913e26a8daa1c0b6e (patch) | |
| tree | 28ba954aa7ea327187e30b98faf044bf9cfbf201 /activesupport/lib | |
| parent | 6d390671f639b3314437054df0d393cef10493bd (diff) | |
| download | rails-9a650a6547d2a83004db1bf913e26a8daa1c0b6e.tar.gz rails-9a650a6547d2a83004db1bf913e26a8daa1c0b6e.tar.bz2 rails-9a650a6547d2a83004db1bf913e26a8daa1c0b6e.zip | |
Silence some trivial warnings: shadowed local vars, indentation mismatches
Diffstat (limited to 'activesupport/lib')
| -rw-r--r-- | activesupport/lib/active_support/callbacks.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/activesupport/lib/active_support/callbacks.rb b/activesupport/lib/active_support/callbacks.rb index 67e9b0103f..97e2a478b5 100644 --- a/activesupport/lib/active_support/callbacks.rb +++ b/activesupport/lib/active_support/callbacks.rb @@ -467,8 +467,8 @@ module ActiveSupport # method that took into consideration the per_key conditions. This # is a speed improvement for ActionPack. # - def set_callback(name, *filters, &block) - __update_callbacks(name, filters, block) do |chain, type, filters, options| + def set_callback(name, *filter_list, &block) + __update_callbacks(name, filter_list, block) do |chain, type, filters, options| filters.map! do |filter| chain.delete_if {|c| c.matches?(type, filter) } Callback.new(chain, filter, type, options.dup, self) @@ -480,8 +480,8 @@ module ActiveSupport # Skip a previously defined callback for a given type. # - def skip_callback(name, *filters, &block) - __update_callbacks(name, filters, block) do |chain, type, filters, options| + def skip_callback(name, *filter_list, &block) + __update_callbacks(name, filter_list, block) do |chain, type, filters, options| chain = send("_#{name}_callbacks=", chain.clone(self)) filters.each do |filter| |