diff options
author | José Valim <jose.valim@plataformatec.com.br> | 2012-02-14 03:09:55 -0800 |
---|---|---|
committer | José Valim <jose.valim@plataformatec.com.br> | 2012-02-14 03:09:55 -0800 |
commit | fa04a737d565c7f06bcac875b4707a01c04acf84 (patch) | |
tree | c139945967efd9993fe5a1fdf4397a837ec0e600 | |
parent | 7f6ee93b0e7933c20e83e84004bb763f03c18404 (diff) | |
parent | 1076c887843f88cf5ec5757afe9428dde2f7e959 (diff) | |
download | rails-fa04a737d565c7f06bcac875b4707a01c04acf84.tar.gz rails-fa04a737d565c7f06bcac875b4707a01c04acf84.tar.bz2 rails-fa04a737d565c7f06bcac875b4707a01c04acf84.zip |
Merge pull request #5039 from funny-falcon/fix_callback
sync __run_callbacks with ruby-trunk
-rw-r--r-- | activesupport/lib/active_support/callbacks.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/callbacks.rb b/activesupport/lib/active_support/callbacks.rb index 1834027e7b..6de49409e5 100644 --- a/activesupport/lib/active_support/callbacks.rb +++ b/activesupport/lib/active_support/callbacks.rb @@ -356,7 +356,7 @@ module ActiveSupport # def __run_callbacks(kind, object, &blk) #:nodoc: name = __callback_runner_name(kind) - unless object.respond_to?(name) + unless object.respond_to?(name, true) str = object.send("_#{kind}_callbacks").compile class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1 def #{name}() #{str} end |