X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/bf29550db840c97cafffbe1e836750bef6c7942d..4bb9f96133e04872739b7f40034521b5b4de6a2d:/lib/validators.rb

diff --git a/lib/validators.rb b/lib/validators.rb
index 095fb7af9..69cabb942 100644
--- a/lib/validators.rb
+++ b/lib/validators.rb
@@ -1,32 +1,15 @@
 module ActiveRecord
   module Validations
     module ClassMethods
-      
-      # error message when invalid UTF-8 is detected
-      @@invalid_utf8_message = " is invalid UTF-8"
-
       ##
       # validation method to be included like any other validations methods
       # in the models definitions. this one checks that the named attribute
       # is a valid UTF-8 format string.
       def validates_as_utf8(*attrs)
         validates_each(attrs) do |record, attr, value|
-          record.errors.add(attr, @@invalid_utf8_message) unless valid_utf8? value
+          record.errors.add(attr, " is invalid UTF-8") unless UTF8.valid? value
         end
-      end    
-      
-      ##
-      # Checks that a string is valid UTF-8 by trying to convert it to UTF-8
-      # using the iconv library, which is in the standard library.
-      def valid_utf8?(str)
-        return true if str.nil?
-        Iconv.conv("UTF-8", "UTF-8", str)
-        return true
-
-      rescue
-        return false
-      end  
-      
+      end
     end
   end
 end