X-Git-Url: http://git.osdn.net/view?p=nucleus-jp%2Fnucleus-jp-ancient.git;a=blobdiff_plain;f=utf8%2Finstall%2Findex.php;h=651bb146c16456c3ce4e732c2e8af3841b7511b3;hp=57fc87225fbad84c3084e8dbee6dae4fe1f56efd;hb=39cd2f1ebf3e5ac6e39a9838eeb0f2c42ca0f721;hpb=9e0a3c7d38c1b452c3e7fa091c395da70d1b4a1c

diff --git a/utf8/install/index.php b/utf8/install/index.php
index 57fc872..651bb14 100755
--- a/utf8/install/index.php
+++ b/utf8/install/index.php
@@ -595,18 +595,16 @@ function doInstall() {
 	if ($MYSQL_CONN == false) {
 		_doError(_ERROR15 . ': ' . sql_error() );
 	}
-
-// <add for garble measure>
+	
 	// 2-2. set DEFAULT CHARSET and COLLATE
 	$mySqlVer = implode('.', array_map('intval', explode('.', sql_get_server_info($MYSQL_CONN))));
-	if ($mySqlVer >= '5.0.7' && phpversion() >= '5.2.3') {
+	if ($mySqlVer >= '5.0.7' && function_exists('mysql_set_charset')) {
 		mysql_set_charset($charset);
 	} elseif ($mySqlVer >= '4.1.0') {
 		sql_query("SET NAMES " . $charset);
 	}
 	$collation = ($charset == 'utf8') ? 'utf8_unicode_ci' : 'ujis_japanese_ci';
-// </add for garble measure>*/
-
+	
 	// 3. try to create database (if needed)
 	if ($mysql_create == 1) {
 		$sql = 'CREATE DATABASE '