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

[rails.git] / lib / utf8.rb

diff --git a/lib/utf8.rb b/lib/utf8.rb
index 7865d62039566855efc105f54b7682d18974cd46..613e3005ea68aedf5815f0c37e023fda557ced8d 100644 (file)
--- a/lib/utf8.rb
+++ b/lib/utf8.rb
@@ -4,6 +4,7 @@ module UTF8
   # using the iconv library, which is in the standard library.
   def self.valid?(str)
     return true if str.nil?
   # using the iconv library, which is in the standard library.
   def self.valid?(str)
     return true if str.nil?

+

     str.valid_encoding?
   end
 end
     str.valid_encoding?
   end
 end