diff options
Diffstat (limited to 'lib/cgi/util.rb')
| -rw-r--r-- | lib/cgi/util.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/cgi/util.rb b/lib/cgi/util.rb index 3fc462df27..61738139fe 100644 --- a/lib/cgi/util.rb +++ b/lib/cgi/util.rb @@ -42,7 +42,8 @@ module CGI::Util # # => "Usage: foo \"bar\" <baz>" def unescapeHTML(string) enc = string.encoding - if [Encoding::UTF_16BE, Encoding::UTF_16LE, Encoding::UTF_32BE, Encoding::UTF_32LE].include?(enc) + return string unless string.include? '&' + if enc != Encoding::UTF_8 && [Encoding::UTF_16BE, Encoding::UTF_16LE, Encoding::UTF_32BE, Encoding::UTF_32LE].include?(enc) return string.gsub(Regexp.new('&(apos|amp|quot|gt|lt|#[0-9]+|#x[0-9A-Fa-f]+);'.encode(enc))) do case $1.encode(Encoding::US_ASCII) when 'apos' then "'".encode(enc) |