[geeklog-hg] geeklog: Optimized COM_getEncodingt function

[geeklog-cvs at lists.geeklog.net]

changeset 9122:1bc3038eb332
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/1bc3038eb332
user: dengen
date: Mon Jun 24 01:54:57 2013 +0900
description:
Optimized COM_getEncodingt function

diffstat:

 public_html/lib-common.php |  42 ++++++++++++++++--------------------------
 1 files changed, 16 insertions(+), 26 deletions(-)

diffs (52 lines):

diff -r a9ffb7aeb664 -r 1bc3038eb332 public_html/lib-common.php
--- a/public_html/lib-common.php	Sun Jun 23 03:05:14 2013 +0900
+++ b/public_html/lib-common.php	Mon Jun 24 01:54:57 2013 +0900
@@ -8641,32 +8641,22 @@
 * @return   string      character set, e.g. 'utf-8'
 *
 */
-function COM_getEncodingt() {
-	global $_CONF, $LANG_CHARSET;
-
-	static $encoding = null;
-
-    $valid_charsets = array('iso-8859-1','iso-8859-15','utf-8','cp866','cp1251','cp1252','koi8-r','big5','gb2312','big5-hkscs','shift_jis','sjis','euc-jp');
-
-	if ($encoding === null) {
-		if (isset($LANG_CHARSET)) {
-			$encoding = $LANG_CHARSET;
-		} else if (isset($_CONF['default_charset'])) {
-			$encoding = $_CONF['default_charset'];
-		} else {
-			$encoding = 'iso-8859-1';
-		}
-	}
-
-	$encoding = strtolower($encoding);
-
-	if ( in_array($encoding,$valid_charsets) ) {
-	    return $encoding;
-	} else {
-	    return 'iso-8859-1';
-	}
-
-	return $encoding;
+function COM_getEncodingt()
+{
+    static $encoding;
+
+    if ($encoding === null) {
+        $encoding = strtolower(COM_getCharset());
+        $valid_charsets = array(
+            'iso-8859-1', 'iso-8859-15', 'utf-8', 'cp866', 'cp1251',
+            'cp1252', 'koi8-r', 'big5', 'gb2312', 'big5-hkscs',
+            'shift_jis', 'sjis', 'euc-jp');
+        if (!in_array($encoding, $valid_charsets)) {
+            $encoding = 'iso-8859-1';
+        }
+    }
+
+    return $encoding;
 }
 
 /**