mirror of https://github.com/rails/rails
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
This commit is contained in:
parent
6863601335
commit
1da6abaa3c
|
@ -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:
|
||||
|
|
|
@ -49,7 +49,7 @@ module ActiveRecord
|
|||
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)
|
||||
|
|
Loading…
Reference in New Issue