Permalink
Browse files

Merge pull request #4581 from kennyj/remove_unused_argument

Remove unused argument.
  • Loading branch information...
2 parents e407eb3 + 9d40c09 commit a0ed45cc283c07998833b406b38aee7c01b63717 @tenderlove tenderlove committed Jan 23, 2012
Showing with 3 additions and 3 deletions.
  1. +3 −3 activesupport/lib/active_support/callbacks.rb
@@ -357,7 +357,7 @@ module ClassMethods
# calculating which callbacks can be omitted because of per_key conditions.
#
def __run_callbacks(key, kind, object, &blk) #:nodoc:
- name = __callback_runner_name(key, kind)
+ name = __callback_runner_name(kind)
unless object.respond_to?(name)
str = send("_#{kind}_callbacks").compile(key, object)
class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
@@ -369,11 +369,11 @@ def #{name}() #{str} end
end
def __reset_runner(symbol)
- name = __callback_runner_name(nil, symbol)
+ name = __callback_runner_name(symbol)
undef_method(name) if method_defined?(name)
end
- def __callback_runner_name(key, kind)
+ def __callback_runner_name(kind)
"_run__#{self.name.hash.abs}__#{kind}__callbacks"
end

0 comments on commit a0ed45c

Please sign in to comment.