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