summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ext/json/lib/json/common.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index b5931cf4b08..9a01eebd0dc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Feb 6 13:48:29 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/json/lib/json/common.rb (JSON::MissingUnicodeSupport.iconv):
+ should not drop rest of the result. use Iconv.conv instead.
+
Sun Feb 6 12:46:02 2011 Eric Hodel <drbrain@segment7.net>
* string.c (gsub): Ensure result encoding is the same as input
diff --git a/ext/json/lib/json/common.rb b/ext/json/lib/json/common.rb
index 13debd1366c..91cb3c21902 100644
--- a/ext/json/lib/json/common.rb
+++ b/ext/json/lib/json/common.rb
@@ -348,7 +348,7 @@ module JSON
else
require 'iconv'
def self.iconv(to, from, string)
- Iconv.iconv(to, from, string).first
+ Iconv.conv(to, from, string)
end
end
end