summary refs log tree commit
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-02-06 04:48:49 +0000
committerNobuyoshi Nakada <nobu@ruby-lang.org>2011-07-07 13:04:23 +0900
commitf43f2dd98f6bb90ecc011e3a4f5c089660ad506a (patch)
tree9e74bd1c4ec4c7df1aab06325b7e52552f1b84c3
parentd4655840f69e0cce077749ad4a2c256e03bb8f66 (diff)
downloadruby-json-f43f2dd98f6bb90ecc011e3a4f5c089660ad506a.tar.gz
* lib/json/common.rb (JSON::MissingUnicodeSupport.iconv): should not drop rest of the result. use Iconv.conv instead.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30807 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--lib/json/common.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/json/common.rb b/lib/json/common.rb
index ee933ed..5419be6 100644
--- a/lib/json/common.rb
+++ b/lib/json/common.rb
@@ -360,7 +360,7 @@ module JSON
     require 'iconv'
     # Encodes string using _iconv_ library
     def self.iconv(to, from, string)
-      Iconv.iconv(to, from, string).first
+      Iconv.conv(to, from, string)
     end
   end