diff --git a/src/install/index.php b/src/install/index.php index 9455393c..d129454b 100644 --- a/src/install/index.php +++ b/src/install/index.php @@ -10,8 +10,7 @@ //error_reporting(E_ALL); error_reporting(E_ALL || ~E_NOTICE); -$verMsg = 'V6 UTF8'; -$s_lang = 'utf-8'; +$verMsg = 'V6'; $dfDbname = 'dedecmsv6utf8'; $errmsg = ''; @@ -22,7 +21,7 @@ $moduleCacheFile = dirname(__FILE__).'/modules.tmp.inc'; define('DEDEINC',dirname(__FILE__).'/../include'); define('DEDEDATA',dirname(__FILE__).'/../data'); define('DEDEROOT',preg_replace("#[\\\\\/]install#", '', dirname(__FILE__))); -header("Content-Type: text/html; charset={$s_lang}"); +header("Content-Type: text/html; charset=utf-8"); require_once(DEDEROOT.'/install/install.inc.php'); require_once(DEDEINC.'/zip.class.php'); diff --git a/src/install/install.inc.php b/src/install/install.inc.php index 417bcc23..5958dac4 100755 --- a/src/install/install.inc.php +++ b/src/install/install.inc.php @@ -9,12 +9,10 @@ */ function RunMagicQuotes(&$str) { - if (!get_magic_quotes_gpc()) { - if (is_array($str)) - foreach ($str as $key => $val) $str[$key] = RunMagicQuotes($val); - else - $str = addslashes($str); - } + if (is_array($str)) + foreach ($str as $key => $val) $str[$key] = RunMagicQuotes($val); + else + $str = addslashes($str); return $str; } diff --git a/src/install/module-install.php b/src/install/module-install.php index c0ff731c..a870c579 100644 --- a/src/install/module-install.php +++ b/src/install/module-install.php @@ -9,7 +9,7 @@ require_once(dirname(__FILE__).'/../include/common.inc.php'); @set_time_limit(0); -$verMsg = 'V6 UTF8 '; +$verMsg = 'V6'; $errmsg = ''; $insLockfile = dirname(__FILE__).'/install_lock.txt'; $moduleCacheFile = dirname(__FILE__).'/modules.tmp.inc'; diff --git a/src/install/templates/step-3.html b/src/install/templates/step-3.html index e41df213..9dbf1601 100755 --- a/src/install/templates/step-3.html +++ b/src/install/templates/step-3.html @@ -50,6 +50,7 @@
+