summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorocean <ocean@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-05-19 10:08:11 +0000
committerocean <ocean@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-05-19 10:08:11 +0000
commit57afbdb7d1eceff4a0662b01338b322dd5639902 (patch)
tree6b6e96a2ff6eaf9d1ca4d35ec93cd0dc150b4d71
parent79a2ce59c5abc137743ce9efaa77d981766635c1 (diff)
* lib/rexml/encodings/SHIFT-JIS.rb: encoding and decoding were
swapped. [ruby-core:4772] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@8488 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--lib/rexml/encodings/SHIFT-JIS.rb4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index ccd2a7831f9..1ddabaf6781 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu May 19 19:04:29 2005 speakillof <speakillof@yahoo.co.jp>
+
+ * lib/rexml/encodings/SHIFT-JIS.rb: encoding and decoding were
+ swapped. [ruby-core:4772]
+
Wed May 18 23:42:25 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* error.c (exc_exception): reverted to call Exception#initialize
diff --git a/lib/rexml/encodings/SHIFT-JIS.rb b/lib/rexml/encodings/SHIFT-JIS.rb
index cbbb88e6830..d055d0c7613 100644
--- a/lib/rexml/encodings/SHIFT-JIS.rb
+++ b/lib/rexml/encodings/SHIFT-JIS.rb
@@ -3,11 +3,11 @@ require 'uconv'
module REXML
module Encoding
def decode_sjis content
- Uconv::u8tosjis(content)
+ Uconv::sjistou8(content)
end
def encode_sjis(str)
- Uconv::sjistou8(str)
+ Uconv::u8tosjis(str)
end
b = proc do |obj|