kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

validates_length_of should not change the options hash in place. [#5283 state:resolved]

Browse source
This commit is contained in:
José Valim 2010-08-03 15:22:54 +02:00
parent 621246f997
commit f23bc8444b
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
activemodel/lib/active_model/validations/length.rb
View file

@ -40,8 +40,6 @@ module ActiveModel
CHECKS.each do |key, validity_check|
next unless check_value = options[key]
default_message = options[MESSAGES[key]]
options[:message] ||= default_message if default_message
valid_value = if key == :maximum
value.nil? || value.size.send(validity_check, check_value)
@ -51,8 +49,13 @@ module ActiveModel
next if valid_value
record.errors.add(attribute, MESSAGES[key],
options.except(*RESERVED_OPTIONS).merge!(:count => check_value))
errors_options = options.except(*RESERVED_OPTIONS)
errors_options[:count] = check_value
default_message = options[MESSAGES[key]]
errors_options[:message] ||= default_message if default_message
record.errors.add(attribute, MESSAGES[key], errors_options)
end
end
end