From 61d31a24343bca7729fa8f95162a95f6e86928a9 Mon Sep 17 00:00:00 2001 From: tianya Date: Mon, 2 Nov 2020 09:56:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=9C=A8=E9=AB=98=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E6=95=B0=E6=8D=AE=E5=BA=93=E4=B8=AD=E5=87=BA=E7=8E=B0?= =?UTF-8?q?=E4=B9=B1=E7=A0=81=E7=9A=84=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/include/dedesql.class.php | 5 ++--- src/include/dedesqli.class.php | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/include/dedesql.class.php b/src/include/dedesql.class.php index 639d5e8e..1df61443 100755 --- a/src/include/dedesql.class.php +++ b/src/include/dedesql.class.php @@ -137,10 +137,9 @@ class DedeSql @mysql_select_db($this->dbName, $this->linkID); $mysqlver = explode('.',$this->GetVersion()); $mysqlver = $mysqlver[0].'.'.$mysqlver[1]; - - if($mysqlver>4.0) + if (version_compare($mysqlver,'4.0',">=") && $GLOBALS['cfg_db_language']) { - @mysql_query("SET NAMES '".$GLOBALS['cfg_db_language']."', character_set_client=binary, sql_mode='', interactive_timeout=3600 ;", $this->linkID); + @mysql_query($this->linkID, "SET character_set_connection=" . $GLOBALS['cfg_db_language'] . ",character_set_results=" . $GLOBALS['cfg_db_language'] . ",character_set_client=binary"); } return TRUE; diff --git a/src/include/dedesqli.class.php b/src/include/dedesqli.class.php index 621e018b..ea429d94 100755 --- a/src/include/dedesqli.class.php +++ b/src/include/dedesqli.class.php @@ -140,7 +140,7 @@ class DedeSqli } $this->isInit = TRUE; $serverinfo = mysqli_get_server_info($this->linkID); - if ($serverinfo > '4.1' && $GLOBALS['cfg_db_language']) + if (version_compare($serverinfo,'4.1',">=") && $GLOBALS['cfg_db_language']) { mysqli_query($this->linkID, "SET character_set_connection=" . $GLOBALS['cfg_db_language'] . ",character_set_results=" . $GLOBALS['cfg_db_language'] . ",character_set_client=binary"); }