diff --git a/upload/api/db/dbbak.php b/upload/api/db/dbbak.php index 60e6c876..201223f4 100644 --- a/upload/api/db/dbbak.php +++ b/upload/api/db/dbbak.php @@ -218,16 +218,13 @@ function connect($dbhost, $dbuser, $dbpw, $dbname = '', $dbcharset, $pconnect = $this->halt('Can not connect to MySQL server'); } - if($this->version() > '4.1') { - if($dbcharset) { - $this->link->set_charset($dbcharset); - } - - if($this->version() > '5.0.1') { - $this->query("SET sql_mode=''"); - } + if($dbcharset) { + $this->link->set_charset($dbcharset); } + $this->link->query("SET sql_mode=''"); + + $this->link->query("SET character_set_client=binary"); } diff --git a/upload/config/config_global_default.php b/upload/config/config_global_default.php index 343840b9..d182c7e5 100644 --- a/upload/config/config_global_default.php +++ b/upload/config/config_global_default.php @@ -9,6 +9,8 @@ $_config = array(); +// 提示:自当前版本起,本文件不支持调用系统内任何变量或函数,请依赖此行为的站点修正实现 // + // ---------------------------- CONFIG DB ----------------------------- // // ---------------------------- 数据库相关设置---------------------------- // diff --git a/upload/install/include/install_function.php b/upload/install/include/install_function.php index 774ef73e..16389b5e 100644 --- a/upload/install/include/install_function.php +++ b/upload/install/include/install_function.php @@ -622,6 +622,7 @@ function show_header() { global $step; $version = DISCUZ_VERSION; $release = DISCUZ_RELEASE; + $th_revision = DISCUZ_TH_REVISION; /*jaideejung007*/ $install_lang = lang(INSTALL_LANG); $title = lang('title_install'); $charset = CHARSET; @@ -646,7 +647,7 @@ function showmessage(message) {