@ -68,10 +68,7 @@ if (file_exists($config['has_installed'])) {
function __query($sql) {
function __query($sql) {
sql_open();
sql_open();
if (mysql_version() >= 50503)
return query($sql);
return query($sql);
else
return query(str_replace('utf8mb4', 'utf8', $sql));
}
}
$boards = listBoards();
$boards = listBoards();
@ -1118,7 +1115,6 @@ if ($step == 0) {
$sql = @file_get_contents('install.sql') or error("Couldn't load install.sql.");
$sql = @file_get_contents('install.sql') or error("Couldn't load install.sql.");
sql_open();
sql_open();
$mysql_version = mysql_version();
// This code is probably horrible, but what I'm trying
// This code is probably horrible, but what I'm trying
// to do is find all of the SQL queires and put them
// to do is find all of the SQL queires and put them
@ -1130,8 +1126,6 @@ if ($step == 0) {
$sql_errors = '';
$sql_errors = '';
foreach ($queries as $query) {
foreach ($queries as $query) {
if ($mysql_version < 50503 )
$query = preg_replace('/(CHARSET=|CHARACTER SET )utf8mb4/', '$1utf8', $query);
$query = preg_replace('/^([\w\s]*)`([0-9a-zA-Z$_\x{0080}-\x{FFFF}]+)`/u', '$1``$2``', $query);
$query = preg_replace('/^([\w\s]*)`([0-9a-zA-Z$_\x{0080}-\x{FFFF}]+)`/u', '$1``$2``', $query);
if (!query($query))
if (!query($query))
$sql_errors .= '< li > ' . db_error() . '< / li > ';
$sql_errors .= '< li > ' . db_error() . '< / li > ';