From: sakamocchi <sakamocchi@1ca29b6e-896d-4ea0-84a5-967f57386b96>
Date: Mon, 21 Mar 2011 03:43:47 +0000 (+0000)
Subject: Put "version_compare " function when comparing versions of MySQL.
X-Git-Tag: release-3-64~15
X-Git-Url: http://git.osdn.net/view?p=nucleus-jp%2Fnucleus-jp-ancient.git;a=commitdiff_plain;h=27fa0c43ae925a55882f75aec9b74658abe05dd1

Put "version_compare " function when comparing versions of MySQL.

git-svn-id: https://svn.sourceforge.jp/svnroot/nucleus-jp/nucleus-jp/trunk@1180 1ca29b6e-896d-4ea0-84a5-967f57386b96
---

diff --git a/utf8/install/index.php b/utf8/install/index.php
index c6b87af..1847a80 100755
--- a/utf8/install/index.php
+++ b/utf8/install/index.php
@@ -207,15 +207,15 @@ function showInstallForm() {
 	ob_end_clean();
 	$mysqlVersion = implode($match, '.');
 	$minVersion   = '3.23';
-
-	if ($mysqlVersion == '0.0.0') {
+	
+	if (version_compare($mySqlVersion, '0.0.0', '==')) {
 		echo _NOTIFICATION1;
 	}
 	else {
 		echo $mysqlVersion;
 	}
 
-	if ($mysqlVersion < $minVersion) {
+	if (version_compare($mySqlVersion, $minVersion, '<')) {
 		echo ' <span class="warning" style="display:block">' . sprintf(_TEXT2_WARN1, $minVersion) . '</span>';
 	}
 ?>
@@ -627,9 +627,9 @@ function doInstall() {
 	// 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')) {
+	if (version_compare($mySqlVer, '5.0.7', '>=') && function_exists('mysql_set_charset')) {
 		mysql_set_charset($charset);
-	} elseif ($mySqlVer >= '4.1.0') {
+	} elseif (version_compare($mySqlVer, '4.1.0', '>=')) {
 		sql_query("SET CHARACTER SET " . $charset);
 	}
 	$collation = ($charset == 'utf8') ? 'utf8_general_ci' : 'ujis_japanese_ci';
@@ -640,7 +640,7 @@ function doInstall() {
 		$sql = 'CREATE DATABASE '
 			 .	 $mysql_database;
 // <add for garble measure>
-	if ($mySqlVer >= '4.1.0') {
+	if (version_compare($mySqlVer, '4.1.0', '>=')) {
 		$sql .= ' DEFAULT CHARACTER SET '
 			  .	 $charset
 			  . ' COLLATE '