kashire/lainchan
4
0
Fork 0
Code Issues 9 Pull Requests Releases Wiki Activity

Fix issue with installing and creating boards with MySQL < 5.5.3. Issue #129

Browse Source
This commit is contained in:
Michael Foster 2013-08-04 15:23:26 -04:00
parent 33a07e9ee0
commit b7070aeac6
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
inc/mod/pages.php
View File

@ -480,7 +480,12 @@ function mod_new_board() {
if (!openBoard($_POST['uri'])) if (!openBoard($_POST['uri']))
error(_("Couldn't open board after creation.")); error(_("Couldn't open board after creation."));
query(Element('posts.sql', array('board' => $board['uri']))) or error(db_error()); $query = Element('posts.sql', array('board' => $board['uri']));
if (mysql_version() < 50503)
$query = preg_replace('/(CHARSET=|CHARACTER SET )utf8mb4/', '$1utf8', $query);
query($query) or error(db_error());
if ($config['cache']['enabled']) if ($config['cache']['enabled'])
cache::delete('all_boards'); cache::delete('all_boards');

5
install.php
View File

@ -618,8 +618,7 @@ 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();
if (mysql_version() < 50503) $mysql_version = mysql_version();
$sql = preg_replace('/(CHARSET=|CHARACTER SET )utf8mb4/', '$1utf8', $sql);
// 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
@ -631,6 +630,8 @@ 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>';