X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ef7f3d800cbdd49b692df10d312e5fd880e2e938..d00a0667bc6e156061a6c6428b0070ced6acda87:/lib/utf8.rb diff --git a/lib/utf8.rb b/lib/utf8.rb index e669d8aae..613e3005e 100644 --- a/lib/utf8.rb +++ b/lib/utf8.rb @@ -2,20 +2,9 @@ module UTF8 ## # 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. - if ''.respond_to?("valid_encoding?") - def self.valid?(str) - return true if str.nil? - str.valid_encoding? - end - else - require 'iconv' + def self.valid?(str) + return true if str.nil? - def self.valid?(str) - return true if str.nil? - Iconv.conv("UTF-8", "UTF-8", str) - return true - rescue - return false - end + str.valid_encoding? end end