diff options
author | Aaron Patterson <aaron.patterson@gmail.com> | 2012-01-23 09:24:29 -0800 |
---|---|---|
committer | Aaron Patterson <aaron.patterson@gmail.com> | 2012-01-23 09:24:29 -0800 |
commit | a0ed45cc283c07998833b406b38aee7c01b63717 (patch) | |
tree | 87c286f0a857988a262f09275ad24474d861e073 /activesupport/lib | |
parent | e407eb3d026089df796d9f53f7ced74e5510d939 (diff) | |
parent | 9d40c09ab27d8b1c20e045a67a4b8c24d838cdfb (diff) | |
download | rails-a0ed45cc283c07998833b406b38aee7c01b63717.tar.gz rails-a0ed45cc283c07998833b406b38aee7c01b63717.tar.bz2 rails-a0ed45cc283c07998833b406b38aee7c01b63717.zip |
Merge pull request #4581 from kennyj/remove_unused_argument
Remove unused argument.
Diffstat (limited to 'activesupport/lib')
-rw-r--r-- | activesupport/lib/active_support/callbacks.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/activesupport/lib/active_support/callbacks.rb b/activesupport/lib/active_support/callbacks.rb index d4a9b93ff2..9cea09db41 100644 --- a/activesupport/lib/active_support/callbacks.rb +++ b/activesupport/lib/active_support/callbacks.rb @@ -357,7 +357,7 @@ module ActiveSupport # 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 @@ module ActiveSupport 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 |