Merge remote-tracking branch 'upstream/pull/5234'

[rails.git] / lib / utf8.rb

diff --git a/lib/utf8.rb b/lib/utf8.rb
index c6e1918afb198b26a245325796624718a3d1f856..613e3005ea68aedf5815f0c37e023fda557ced8d 100644 (file)
--- 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