X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/c24c2e481cc6d27e76274ed4e32668a4690a7788..e89a78fff858d5db07f6959a39dd9655dc46008e:/app/validators/characters_validator.rb?ds=inline diff --git a/app/validators/characters_validator.rb b/app/validators/characters_validator.rb index ee5b5bcf3..13d08ca55 100644 --- a/app/validators/characters_validator.rb +++ b/app/validators/characters_validator.rb @@ -3,10 +3,7 @@ class CharactersValidator < ActiveModel::EachValidator INVALID_URL_CHARS = "/;.,?%#".freeze def validate_each(record, attribute, value) - record.errors[attribute] << (options[:message] || I18n.t("validations.invalid_characters")) if /[#{INVALID_CHARS}]/.match?(value) - - if options[:url_safe] - record.errors[attribute] << (options[:message] || I18n.t("validations.url_characters", :characters => INVALID_URL_CHARS)) if /[#{INVALID_URL_CHARS}]/.match?(value) - end + record.errors.add(attribute, options[:message] || I18n.t("validations.invalid_characters")) if /[#{INVALID_CHARS}]/o.match?(value) + record.errors.add(attribute, options[:message] || I18n.t("validations.url_characters", :characters => INVALID_URL_CHARS)) if options[:url_safe] && /[#{INVALID_URL_CHARS}]/o.match?(value) end end