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

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

diff --git a/app/validators/characters_validator.rb b/app/validators/characters_validator.rb
index ee5b5bcf3b4463815421cf9c4201fff0bcacf620..94d340731ada18edf952ccaf887b3fe1396af246 100644 (file)
--- a/app/validators/characters_validator.rb
+++ b/app/validators/characters_validator.rb
@@ -4,9 +4,6 @@ class CharactersValidator < ActiveModel::EachValidator
 
   def validate_each(record, attribute, value)
     record.errors[attribute] << (options[:message] || I18n.t("validations.invalid_characters")) if /[#{INVALID_CHARS}]/.match?(value)
 
   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[attribute] << (options[:message] || I18n.t("validations.url_characters", :characters => INVALID_URL_CHARS)) if options[:url_safe] && /[#{INVALID_URL_CHARS}]/.match?(value)

   end
 end
   end
 end