summaryrefslogtreecommitdiff
path: root/lib/cgi.rb
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-08-22 09:38:19 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-08-22 09:38:19 +0000
commit0abbcb67d1aeab206eecf06310ad50a3d9e7f05f (patch)
tree3bb8227891dd26273f9677c2b747880f43d6e83a /lib/cgi.rb
parentbb788d232812e17c5bbd79f2129e345d418537fb (diff)
revert nkf -m0 patch for UTF-8
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@10757 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/cgi.rb')
-rw-r--r--lib/cgi.rb8
1 files changed, 3 insertions, 5 deletions
diff --git a/lib/cgi.rb b/lib/cgi.rb
index 0878edffa4..1598df89f2 100644
--- a/lib/cgi.rb
+++ b/lib/cgi.rb
@@ -708,16 +708,14 @@ class CGI
require "nkf"
case options["charset"]
when /iso-2022-jp/ni
- content = NKF::nkf('-j -m0', content)
+ content = NKF::nkf('-j', content)
options["language"] = "ja" unless options.has_key?("language")
when /euc-jp/ni
- content = NKF::nkf('-e -m0', content)
+ content = NKF::nkf('-e', content)
options["language"] = "ja" unless options.has_key?("language")
when /shift_jis/ni
- content = NKF::nkf('-s -m0', content)
+ content = NKF::nkf('-s', content)
options["language"] = "ja" unless options.has_key?("language")
- when /utf-8/ni
- content = NKF::nkf('-w -m0', content)
end
end