Added the possibility of marking fields as being in error without adding a message (using nil) to it thatll get displayed wth full_messages #208 [mjobin]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@135 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

1 files changed, 2 insertions, 2 deletions

diff --git a/activerecord/lib/active_record/validations.rb b/activerecord/lib/active_record/validations.rb
index dda282115f..2ae4edbb2d 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) end") }
+        VALIDATIONS.each { |vd| base.class_eval("def self.#{vd}(*methods) write_inheritable_array(\"#{vd}\", methods - (read_inheritable_attribute(\"#{vd}\") || [])) end") }
       end
       
       base.extend(ClassMethods)
@@ -353,7 +353,7 @@ module ActiveRecord
           if attr == "base"
             full_messages << msg
           else
-            full_messages << @base.class.human_attribute_name(attr) + " " + msg
+            full_messages << @base.class.human_attribute_name(attr) + " " + msg unless msg.nil?
           end
         end
       end