From: cigamit Date: Mon, 22 Aug 2005 21:36:02 +0000 (+0000) Subject: Fix a small typo (at least I assume) X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=4a46b5380471dbcb1e823b2b432eae99c5e6efe5;p=squirrelmail.git Fix a small typo (at least I assume) git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@9981 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- diff --git a/functions/i18n.php b/functions/i18n.php index d4799d26..b6b3a942 100644 --- a/functions/i18n.php +++ b/functions/i18n.php @@ -134,7 +134,7 @@ function charset_decode ($charset, $string, $force_decode=false, $save_html=fals // Don't do conversion if charset is the same. if ( ! $force_decode && $charset == strtolower($default_charset) ) - return ($save_html ? $strings : htmlspecialchars($string)); + return ($save_html ? $string : htmlspecialchars($string)); // catch iso-8859-8-i thing if ( $charset == "iso-8859-8-i" ) @@ -150,7 +150,7 @@ function charset_decode ($charset, $string, $force_decode=false, $save_html=fals // other charsets can be converted to utf-8 without loss. // and output string is smaller $string = recode_string($charset . "..utf-8",$string); - return ($save_html ? $strings : htmlspecialchars($string)); + return ($save_html ? $string : htmlspecialchars($string)); } else { $string = recode_string($charset . "..html",$string); // recode does not convert single quote, htmlspecialchars does. @@ -166,7 +166,7 @@ function charset_decode ($charset, $string, $force_decode=false, $save_html=fals // iconv functions does not have html target and can be used only with utf-8 if ( $use_php_iconv && $default_charset=='utf-8') { $string = iconv($charset,$default_charset,$string); - return ($save_html ? $strings : htmlspecialchars($string)); + return ($save_html ? $string : htmlspecialchars($string)); } // If we don't use recode and iconv, we'll do it old way.