There are some servers which install php 5.2.3 but the function mysql_set_charset...

[nucleus-jp/nucleus-jp-ancient.git] / utf8 / install / index.php

diff --git a/utf8/install/index.php b/utf8/install/index.php
index 57fc872..651bb14 100755 (executable)
--- a/utf8/install/index.php
+++ b/utf8/install/index.php
@@ -595,18 +595,16 @@ function doInstall() {
        if ($MYSQL_CONN == false) {\r
                _doError(_ERROR15 . ': ' . sql_error() );\r
        }\r
-\r
-// <add for garble measure>\r
+       \r
        // 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
                mysql_set_charset($charset);\r
        } elseif ($mySqlVer >= '4.1.0') {\r
                sql_query("SET NAMES " . $charset);\r
        }\r
        $collation = ($charset == 'utf8') ? 'utf8_unicode_ci' : 'ujis_japanese_ci';\r
-// </add for garble measure>*/\r
-\r
+       \r
        // 3. try to create database (if needed)\r
        if ($mysql_create == 1) {\r
                $sql = 'CREATE DATABASE '\r