aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2013-05-14 12:03:33 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2013-05-14 12:03:33 -0700
commit78202055c971659689f6a96a5b4aa2c138cb44d2 (patch)
treeea91cb143c380e6a8faa2dd9f69ec2ee0ca83579 /activesupport
parent87378b0b6d5361d380ce85e4c08b147a9e7c375b (diff)
downloadrails-78202055c971659689f6a96a5b4aa2c138cb44d2.tar.gz
rails-78202055c971659689f6a96a5b4aa2c138cb44d2.tar.bz2
rails-78202055c971659689f6a96a5b4aa2c138cb44d2.zip
fix shadowed variable warnings
Diffstat (limited to 'activesupport')
-rw-r--r--activesupport/lib/active_support/callbacks.rb10
1 files changed, 5 insertions, 5 deletions
diff --git a/activesupport/lib/active_support/callbacks.rb b/activesupport/lib/active_support/callbacks.rb
index cc4f589203..ab3bb23e88 100644
--- a/activesupport/lib/active_support/callbacks.rb
+++ b/activesupport/lib/active_support/callbacks.rb
@@ -507,9 +507,9 @@ module ActiveSupport
@callbacks = nil
end
- def each(&block); @chain.each(&block); end
- def index(o); @chain.index(o); end
- def empty?; @chain.empty?; end
+ def each(&block); @chain.each(&block); end
+ def index(o); @chain.index(o); end
+ def empty?; @chain.empty?; end
def insert(index, o)
@callbacks = nil
@@ -629,9 +629,9 @@ module ActiveSupport
# existing chain rather than appended.
def set_callback(name, *filter_list, &block)
type, filters, options = normalize_callback_params(name, filter_list, block)
- chain = get_callbacks name
+ self_chain = get_callbacks name
mapped = filters.map do |filter|
- Callback.build(chain, filter, type, options.dup)
+ Callback.build(self_chain, filter, type, options.dup)
end
__update_callbacks(name) do |target, chain|