X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/32b280eb8dfd11d03646cb89c339d2b938f06a6e..570fd3b6aae3757a55b969bb45d3e06bdac3332a:/lib/validators.rb

diff --git a/lib/validators.rb b/lib/validators.rb
index 095fb7af9..640a49564 100644
--- a/lib/validators.rb
+++ b/lib/validators.rb
@@ -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
 
-      rescue
-        return false
-      end  
-      
     end
   end
 end