X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/fd6f00b069af5a7b87227ea4c3401dc461d7311a..34e3e51456774127d43408b7ab65c24f41373f62:/lib/validators.rb

diff --git a/lib/validators.rb b/lib/validators.rb
index 095fb7af9..94dbdb7f3 100644
--- a/lib/validators.rb
+++ b/lib/validators.rb
@@ -1,7 +1,7 @@
 module ActiveRecord
   module Validations
     module ClassMethods
-      
+
       # error message when invalid UTF-8 is detected
       @@invalid_utf8_message = " is invalid UTF-8"
 
@@ -11,22 +11,10 @@ module ActiveRecord
       # 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, @@invalid_utf8_message) 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
+      end
 
-      rescue
-        return false
-      end  
-      
     end
   end
 end