aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSokolov Yura <funny.falcon@gmail.com>2012-02-14 15:05:45 +0400
committerSokolov Yura <funny.falcon@gmail.com>2012-02-14 15:05:45 +0400
commit1076c887843f88cf5ec5757afe9428dde2f7e959 (patch)
treec139945967efd9993fe5a1fdf4397a837ec0e600
parent7f6ee93b0e7933c20e83e84004bb763f03c18404 (diff)
downloadrails-1076c887843f88cf5ec5757afe9428dde2f7e959.tar.gz
rails-1076c887843f88cf5ec5757afe9428dde2f7e959.tar.bz2
rails-1076c887843f88cf5ec5757afe9428dde2f7e959.zip
sync __run_callbacks with ruby-trunk
https://bugs.ruby-lang.org/projects/ruby-trunk/repository/revisions/34580 In this revision behavior of respond_to? had changed: now to ask about protected method one should pass second argument `true`
-rw-r--r--activesupport/lib/active_support/callbacks.rb2
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