diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2004-12-12 16:51:02 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2004-12-12 16:51:02 +0000 |
| commit | 1da6abaa3c544a17bb46772fad91aa0247be5489 (patch) | |
| tree | 0833999f6e2093ff7250426dcecb7b6cef623879 /activerecord/lib/active_record/callbacks.rb | |
| parent | 68636013352bc8730d1f7fb43fee03a19c65d57a (diff) | |
| download | rails-1da6abaa3c544a17bb46772fad91aa0247be5489.tar.gz rails-1da6abaa3c544a17bb46772fad91aa0247be5489.tar.bz2 rails-1da6abaa3c544a17bb46772fad91aa0247be5489.zip | |
No longer necessary to guard against reincludes with the new reset of inheritance variables
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@127 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record/callbacks.rb')
| -rwxr-xr-x | activerecord/lib/active_record/callbacks.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/callbacks.rb b/activerecord/lib/active_record/callbacks.rb index e4987ceb43..2ffe9db693 100755 --- a/activerecord/lib/active_record/callbacks.rb +++ b/activerecord/lib/active_record/callbacks.rb @@ -191,7 +191,7 @@ module ActiveRecord alias_method :destroy, :destroy_with_callbacks end - CALLBACKS.each { |cb| base.class_eval("def self.#{cb}(*methods) write_inheritable_array(\"#{cb}\", methods - (read_inheritable_attribute(\"#{cb}\") || [])) end") } + CALLBACKS.each { |cb| base.class_eval("def self.#{cb}(*methods) write_inheritable_array(\"#{cb}\", methods) end") } end module ClassMethods #:nodoc: |