summaryrefslogtreecommitdiff
path: root/lib/rexml/encodings/UTF-16.rb
diff options
context:
space:
mode:
authorknu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-04-18 07:22:13 +0000
committerknu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-04-18 07:22:13 +0000
commit544c019df27d721b6707b15f72f9603bd4950532 (patch)
tree26420777b918e3d0c09cbf4df1d1d6df1d31d789 /lib/rexml/encodings/UTF-16.rb
parent23872de6bcaea805b2bce6ed70e2fb0db4ec8e2a (diff)
* lib/rexml: Merge fixes since 1.8.6 made solely on the ruby_1_8_6
branch. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@16068 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rexml/encodings/UTF-16.rb')
-rw-r--r--lib/rexml/encodings/UTF-16.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/rexml/encodings/UTF-16.rb b/lib/rexml/encodings/UTF-16.rb
index 792adfd44d..007c493d9c 100644
--- a/lib/rexml/encodings/UTF-16.rb
+++ b/lib/rexml/encodings/UTF-16.rb
@@ -16,7 +16,7 @@ module REXML
end
def decode_utf16(str)
- str = str[2..-1] if /^\376\377/ =~ str
+ str = str[2..-1] if /^\376\377/n =~ str
array_enc=str.unpack('C*')
array_utf8 = []
0.step(array_enc.size-1, 2){|i|