]> git.openstreetmap.org Git - rails.git/blobdiff - app/validators/characters_validator.rb
Convert the search forms to bootstrap
[rails.git] / app / validators / characters_validator.rb
index ee5b1206a08354c3406e2e383c331fe1089c23bf..837e3e6cc89628fe130b52b09816fc73341f54e2 100644 (file)
@@ -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[attribute] << (options[:message] || I18n.t("validations.invalid_characters")) if /[#{INVALID_CHARS}]/o.match?(value)
+    record.errors[attribute] << (options[:message] || I18n.t("validations.url_characters", :characters => INVALID_URL_CHARS)) if options[:url_safe] && /[#{INVALID_URL_CHARS}]/o.match?(value)
   end
 end