瀏覽代碼

Fix a small typo (at least I assume)

Jimmy Conner 20 年之前
父節點
當前提交
732c3eaaec
共有 1 個文件被更改,包括 3 次插入3 次删除
  1. 3 3
      functions/i18n.php

+ 3 - 3
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.
     // Don't do conversion if charset is the same.
     if ( ! $force_decode && $charset == strtolower($default_charset) )
     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
     // catch iso-8859-8-i thing
     if ( $charset == "iso-8859-8-i" )
     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.
             // other charsets can be converted to utf-8 without loss.
             // and output string is smaller
             // and output string is smaller
             $string = recode_string($charset . "..utf-8",$string);
             $string = recode_string($charset . "..utf-8",$string);
-            return ($save_html ? $strings : htmlspecialchars($string));
+            return ($save_html ? $string : htmlspecialchars($string));
         } else {
         } else {
             $string = recode_string($charset . "..html",$string);
             $string = recode_string($charset . "..html",$string);
             // recode does not convert single quote, htmlspecialchars does.
             // 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
     // iconv functions does not have html target and can be used only with utf-8
     if ( $use_php_iconv && $default_charset=='utf-8') {
     if ( $use_php_iconv && $default_charset=='utf-8') {
         $string = iconv($charset,$default_charset,$string);
         $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.
     // If we don't use recode and iconv, we'll do it old way.