From: tokul Date: Mon, 24 Apr 2006 17:47:58 +0000 (+0000) Subject: extra sanitizing was added in B and Q header decoding, when SquirrelMail tried to X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=bc6c0fbaad6d3280966155d13783f18e8b7a3d87;p=squirrelmail.git extra sanitizing was added in B and Q header decoding, when SquirrelMail tried to convert header to user's character set (#1460638). git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@11085 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- diff --git a/functions/mime.php b/functions/mime.php index d06aecde..58f29884 100644 --- a/functions/mime.php +++ b/functions/mime.php @@ -759,7 +759,7 @@ function decodeHeader ($string, $utfencode=true,$htmlsave=true,$decide=false) { /* convert string to different charset, * if functions asks for it (usually in compose) */ - $ret .= charset_convert($res[2],$replace,$default_charset); + $ret .= charset_convert($res[2],$replace,$default_charset,$htmlsave); } else { // convert string to html codes in order to display it $ret .= charset_decode($res[2],$replace); @@ -780,7 +780,7 @@ function decodeHeader ($string, $utfencode=true,$htmlsave=true,$decide=false) { /* convert string to different charset, * if functions asks for it (usually in compose) */ - $replace = charset_convert($res[2], $replace,$default_charset); + $replace = charset_convert($res[2], $replace,$default_charset,$htmlsave); } else { // convert string to html codes in order to display it $replace = charset_decode($res[2], $replace);