Permalink
Browse files

validates_confirmation_of only kicks in when the attribute, rather th…

…an its confirmation, is present. Closes #785.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4917 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
jeremy committed Sep 3, 2006
1 parent 6d17ece commit d9839c195288dd5636da1c70f3c34dbc07c6b679
Showing with 4 additions and 1 deletion.
  1. +2 −0 activerecord/CHANGELOG
  2. +2 −1 activerecord/lib/active_record/validations.rb
View
@@ -1,5 +1,7 @@
*SVN*
+* validates_confirmation_of only kicks in when the attribute, rather than its confirmation, is present. #785 [z@wzph.com]
+
* to_xml: the :methods option works on arrays of records. #5845 [Josh Starcher]
* Deprecation: update docs. #5998 [jakob@mentalized.net, Kevin Clark]
@@ -333,7 +333,8 @@ def validates_confirmation_of(*attr_names)
attr_accessor *(attr_names.map { |n| "#{n}_confirmation" })
validates_each(attr_names, configuration) do |record, attr_name, value|
- record.errors.add(attr_name, configuration[:message]) unless record.send("#{attr_name}_confirmation").nil? or value == record.send("#{attr_name}_confirmation")
+ confirm = record.send("#{attr_name}_confirmation")
+ record.errors.add(attr_name, configuration[:message]) unless value.nil? || value == confirm
end
end

0 comments on commit d9839c1

Please sign in to comment.