X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=include%2Flanguages.php;h=c6b93a5a9e1ade243c2482778f2d0880adac1967;hp=e79764290f169c53cf1690d3092ed79931900d7f;hb=a3bb5005c9346a5d7595a15770b4a6dabc790047;hpb=4b5049de2fa934c45599d6e4c74bf2bbee10d34d diff --git a/include/languages.php b/include/languages.php index e7976429..c6b93a5a 100644 --- a/include/languages.php +++ b/include/languages.php @@ -191,7 +191,7 @@ function charset_decode ($charset, $string, $force_decode=false, $save_html=fals $decode=fixcharset($charset); $decodefile=SM_PATH . 'functions/decode/' . $decode . '.php'; - if (file_exists($decodefile)) { + if ($decode != 'index' && file_exists($decodefile)) { include_once($decodefile); // send $save_html argument to decoding function. needed for iso-2022-xx decoding. $ret = call_user_func('charset_decode_'.$decode, $string, $save_html); @@ -214,7 +214,7 @@ function charset_encode($string,$charset,$htmlencode=true) { $encode=fixcharset($charset); $encodefile=SM_PATH . 'functions/encode/' . $encode . '.php'; - if (file_exists($encodefile)) { + if ($encode != 'index' && file_exists($encodefile)) { include_once($encodefile); $ret = call_user_func('charset_encode_'.$encode, $string); } elseif(file_exists(SM_PATH . 'functions/encode/us_ascii.php')) {