Permalink
Browse files

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
  • Loading branch information...
1 parent 6863601 commit 1da6abaa3c544a17bb46772fad91aa0247be5489 @dhh dhh committed Dec 12, 2004
Showing with 2 additions and 2 deletions.
  1. +1 −1 activerecord/lib/active_record/callbacks.rb
  2. +1 −1 activerecord/lib/active_record/validations.rb
@@ -191,7 +191,7 @@ class << self
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:
@@ -49,7 +49,7 @@ def self.append_features(base) # :nodoc:
alias_method :update_attribute_without_validation_skipping, :update_attribute
alias_method :update_attribute, :update_attribute_with_validation_skipping
- VALIDATIONS.each { |vd| base.class_eval("def self.#{vd}(*methods) write_inheritable_array(\"#{vd}\", methods - (read_inheritable_attribute(\"#{vd}\") || [])) end") }
+ VALIDATIONS.each { |vd| base.class_eval("def self.#{vd}(*methods) write_inheritable_array(\"#{vd}\", methods) end") }
end
base.extend(ClassMethods)

0 comments on commit 1da6aba

Please sign in to comment.