Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
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
dhh committed Dec 12, 2004
1 parent 6863601 commit 1da6aba
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion activerecord/lib/active_record/callbacks.rb
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion activerecord/lib/active_record/validations.rb
Expand Up @@ -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)
Expand Down

0 comments on commit 1da6aba

Please sign in to comment.