X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/9813d9f1e48d575bb0e0b5029dc0ec134a011090..06d03c8acccfadfe7e2bf441c9fbd0044e7a2fcf:/lib/utf8.rb diff --git a/lib/utf8.rb b/lib/utf8.rb index c6e1918af..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 String.new.respond_to?("valid_encoding?") - def self.valid?(str) - return true if str.nil? - return 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