Merge remote-tracking branch 'upstream/pull/4143'

[rails.git] / app / validators / characters_validator.rb

diff --git a/app/validators/characters_validator.rb b/app/validators/characters_validator.rb
index ee5b1206a08354c3406e2e383c331fe1089c23bf..13d08ca55e06e1079f9b44c39ba429e854a06916 100644 (file)
--- 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 value =~ /[#{INVALID_CHARS}]/
-
-    if options[:url_safe]
-      record.errors[attribute] << (options[:message] || I18n.t("validations.url_characters", :characters => INVALID_URL_CHARS)) if value =~ /[#{INVALID_URL_CHARS}]/
-    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