From b7070aeac68c18e96c29babbb8d60c8e8ff1c659 Mon Sep 17 00:00:00 2001
From: Michael Foster <savetheinternet@tinyboard.org>
Date: Sun, 4 Aug 2013 15:23:26 -0400
Subject: [PATCH] Fix issue with installing and creating boards with MySQL <
 5.5.3. Issue #129

---
 inc/mod/pages.php | 7 ++++++-
 install.php       | 5 +++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/inc/mod/pages.php b/inc/mod/pages.php
index 0a9f825b..706d747d 100644
--- a/inc/mod/pages.php
+++ b/inc/mod/pages.php
@@ -480,7 +480,12 @@ function mod_new_board() {
 		if (!openBoard($_POST['uri']))
 			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'])
 			cache::delete('all_boards');
diff --git a/install.php b/install.php
index 81b2e136..6971437a 100644
--- a/install.php
+++ b/install.php
@@ -618,8 +618,7 @@ if ($step == 0) {
 	$sql = @file_get_contents('install.sql') or error("Couldn't load install.sql.");
 	
 	sql_open();
-	if (mysql_version() < 50503)
-		$sql = preg_replace('/(CHARSET=|CHARACTER SET )utf8mb4/', '$1utf8', $sql);
+	$mysql_version = mysql_version();
 	
 	// This code is probably horrible, but what I'm trying
 	// to do is find all of the SQL queires and put them
@@ -631,6 +630,8 @@ if ($step == 0) {
 	
 	$sql_errors = '';
 	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);
 		if (!query($query))
 			$sql_errors .= '<li>' . db_error() . '</li>';