summaryrefslogtreecommitdiff
path: root/lib/rexml
diff options
context:
space:
mode:
Diffstat (limited to 'lib/rexml')
-rw-r--r--lib/rexml/encodings/EUC-JP.rb4
-rw-r--r--lib/rexml/encodings/Shift-JIS.rb4
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/rexml/encodings/EUC-JP.rb b/lib/rexml/encodings/EUC-JP.rb
index 23a1c3c657..1be5663be8 100644
--- a/lib/rexml/encodings/EUC-JP.rb
+++ b/lib/rexml/encodings/EUC-JP.rb
@@ -18,11 +18,11 @@ rescue LoadError
module REXML
module Encoding
def from_euc_jp(str)
- return Iconv::iconv("utf-8", "euc-jp", str)[0]
+ return Iconv::iconv("utf-8", "euc-jp", str).join
end
def to_euc_jp content
- return Iconv::iconv("euc-jp", "utf-8", content)[0]
+ return Iconv::iconv("euc-jp", "utf-8", content).join
end
end
end
diff --git a/lib/rexml/encodings/Shift-JIS.rb b/lib/rexml/encodings/Shift-JIS.rb
index e805456ea7..d5267c01b2 100644
--- a/lib/rexml/encodings/Shift-JIS.rb
+++ b/lib/rexml/encodings/Shift-JIS.rb
@@ -18,11 +18,11 @@ rescue LoadError
module REXML
module Encoding
def from_shift_jis(str)
- return Iconv::iconv("utf-8", "shift-jis", str)[0]
+ return Iconv::iconv("utf-8", "shift-jis", str).join
end
def to_shift_jis content
- return Iconv::iconv("euc-jp", "shift-jis", content)[0]
+ return Iconv::iconv("shift-jis", "utf-8", content).join
end
end
end