aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/validations.rb
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2004-12-12 16:51:02 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2004-12-12 16:51:02 +0000
commit1da6abaa3c544a17bb46772fad91aa0247be5489 (patch)
tree0833999f6e2093ff7250426dcecb7b6cef623879 /activerecord/lib/active_record/validations.rb
parent68636013352bc8730d1f7fb43fee03a19c65d57a (diff)
downloadrails-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/validations.rb')
-rwxr-xr-xactiverecord/lib/active_record/validations.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/validations.rb b/activerecord/lib/active_record/validations.rb
index 2e4be21a69..dda282115f 100755
--- a/activerecord/lib/active_record/validations.rb
+++ b/activerecord/lib/active_record/validations.rb
@@ -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)