X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/0d3a9ed9cb47ce3b89ea9eaffbb589f9a9ff6d22..d82f9d12ce55a0287361ed4f93cd97e896778a35:/lib/utf8.rb

diff --git a/lib/utf8.rb b/lib/utf8.rb
index c6e1918af..7865d6203 100644
--- a/lib/utf8.rb
+++ b/lib/utf8.rb
@@ -2,20 +2,8 @@ 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?
-      Iconv.conv("UTF-8", "UTF-8", str)
-      return true
-    rescue
-      return false
-    end
+  def self.valid?(str)
+    return true if str.nil?
+    str.valid_encoding?
   end
 end