Merge branch 'master' of https://github.com/savetheinternet/Tinyboard

1 files changed, 5 insertions, 1 deletions

diff --git a/install.php b/install.php
index 4bef759d..7a1117bf 100644
--- a/install.php
+++ b/install.php
@@ -509,6 +509,9 @@ if ($step == 0) {
 		<label for="db_db">Database:</label> 
 		<input type="text" id="db_db" name="db[database]" value="" />
 		
+		<label for="db_pass">Table prefix (optional):</label> 
+		<input type="password" id="db_pass" name="db[prefix]" value="" />
+		
 		<label for="db_user">Username:</label> 
 		<input type="text" id="db_user" name="db[user]" value="" />
 		
@@ -676,7 +679,8 @@ if ($step == 0) {
 	$queries[] = Element('posts.sql', array('board' => 'b'));
 	
 	$sql_errors = '';
-	foreach ($queries as &$query) {
+	foreach ($queries as $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>';
 	}