aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel/lib/active_model
diff options
context:
space:
mode:
Diffstat (limited to 'activemodel/lib/active_model')
-rw-r--r--activemodel/lib/active_model/validations/confirmation.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activemodel/lib/active_model/validations/confirmation.rb b/activemodel/lib/active_model/validations/confirmation.rb
index 3b2093aef9..bb2f0bd064 100644
--- a/activemodel/lib/active_model/validations/confirmation.rb
+++ b/activemodel/lib/active_model/validations/confirmation.rb
@@ -11,7 +11,7 @@ module ActiveModel
if (confirmed = record.send("#{attribute}_confirmation"))
unless confimation_value_equal?(record, attribute, value, confirmed)
human_attribute_name = record.class.human_attribute_name(attribute)
- record.errors.add(:"#{attribute}_confirmation", :confirmation, options.merge(attribute: human_attribute_name))
+ record.errors.add(:"#{attribute}_confirmation", :confirmation, options.except(:case_sensitive).merge!(attribute: human_attribute_name))
end
end
end
@@ -28,7 +28,7 @@ module ActiveModel
end
def confimation_value_equal?(record, attribute, value, confirmed)
- if !options[:case_sensitive] && value.is_a? String
+ if !options[:case_sensitive] && value.is_a?(String)
value.casecmp(confirmed) == 0
else
value == confirmed