From 329c81bbd3839a3ddee6f30bc87888a5d516aea4 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Thu, 18 Jul 2013 16:13:48 -0400
Subject: catalog: translation fix

---
 templates/themes/catalog/catalog.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'templates/themes')

diff --git a/templates/themes/catalog/catalog.html b/templates/themes/catalog/catalog.html
index 7fcae04e..986db846 100644
--- a/templates/themes/catalog/catalog.html
+++ b/templates/themes/catalog/catalog.html
@@ -22,7 +22,7 @@
 				<img src="{{post.file}}" class="{{post.board}}" title="{{post.bump|date('%b %d %H:%M')}}">
 			</a>
 			<span class="replies">
-				<strong>{{ post.reply_count }} {% if post.reply_count == 1 %}{% trans 'reply' %}{% else %}{% trans 'replies' %}{% endif %}</strong><br/>
+				<strong>{% trans %}1 reply{% plural post.omitted %}{{ count }} replies{% endtrans %}</strong><br/>
 				{{ post.body }}
 			</span>
 		</div>
-- 
cgit v1.3


From f0aee74523158e9c7504502bb54100681fffe0d5 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Thu, 18 Jul 2013 16:16:43 -0400
Subject: catalog: fix previous commit

---
 templates/themes/catalog/catalog.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'templates/themes')

diff --git a/templates/themes/catalog/catalog.html b/templates/themes/catalog/catalog.html
index 986db846..7b8c075a 100644
--- a/templates/themes/catalog/catalog.html
+++ b/templates/themes/catalog/catalog.html
@@ -22,7 +22,7 @@
 				<img src="{{post.file}}" class="{{post.board}}" title="{{post.bump|date('%b %d %H:%M')}}">
 			</a>
 			<span class="replies">
-				<strong>{% trans %}1 reply{% plural post.omitted %}{{ count }} replies{% endtrans %}</strong><br/>
+				<strong>{% trans %}1 reply{% plural post.reply_count %}{{ count }} replies{% endtrans %}</strong><br/>
 				{{ post.body }}
 			</span>
 		</div>
-- 
cgit v1.3


From 35f8730f40d745b93cefbca92d5e83a18599f70c Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Sat, 27 Jul 2013 00:13:54 -0400
Subject: ukko: fix top boardlist losing its fixed status

---
 templates/themes/ukko/ukko.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'templates/themes')

diff --git a/templates/themes/ukko/ukko.js b/templates/themes/ukko/ukko.js
index baf0f78d..dc8ed382 100644
--- a/templates/themes/ukko/ukko.js
+++ b/templates/themes/ukko/ukko.js
@@ -18,7 +18,7 @@ $(document).ready(function() {
 					cache.push(page);
 
 					$(data).find('div[id*="thread_"]').each(function() {
-						$('body').prepend($(this).css('display', 'none').attr('data-board', overflow[0].board));
+						$('form[name="postcontrols"]').prepend($(this).css('display', 'none').attr('data-board', overflow[0].board));
 					});
 
 					thread = $('div#thread_' + overflow[0].id + '[data-board="' + overflow[0].board + '"]');
@@ -34,4 +34,4 @@ $(document).ready(function() {
 		}
 	});
 
-});
\ No newline at end of file
+});
-- 
cgit v1.3


From e3cb427feefbbb4fd6a5e76ce77ef80a240941f1 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Sat, 27 Jul 2013 00:57:12 -0400
Subject: ukko: fix javascript interoperation

---
 js/expand.js                  | 10 +++++++++-
 js/hide-threads.js            | 12 +++++++++---
 js/show-backlinks.js          |  7 ++++++-
 templates/themes/ukko/ukko.js |  3 ++-
 4 files changed, 26 insertions(+), 6 deletions(-)

(limited to 'templates/themes')

diff --git a/js/expand.js b/js/expand.js
index a737ee7f..06151627 100644
--- a/js/expand.js
+++ b/js/expand.js
@@ -15,7 +15,7 @@ $(document).ready(function(){
 	if($('div.banner').length != 0)
 		return; // not index
 	
-	$('div.post.op span.omitted').each(function() {
+	var do_expand = function() {
 		$(this)
 			.html($(this).text().replace(_("Click reply to view."), '<a href="javascript:void(0)">'+_("Click to expand")+'</a>.'))
 			.find('a').click(function() {
@@ -52,5 +52,13 @@ $(document).ready(function(){
 					}
 				});
 			});
+	}
+
+	$('div.post.op span.omitted').each(do_expand);
+
+	$(document).bind("new_post", function(e, post) {
+		if (!$(post).hasClass("reply")) {
+			$(post).find('div.post.op span.omitted').each(do_expand);
+		}
 	});
 });
diff --git a/js/hide-threads.js b/js/hide-threads.js
index abaa700f..44bd829b 100644
--- a/js/hide-threads.js
+++ b/js/hide-threads.js
@@ -35,7 +35,7 @@ $(document).ready(function(){
 		}
 	}
 	
-	$('div.post.op').each(function() {
+	var do_hide_threads = function() {
 		var id = $(this).children('p.intro').children('a.post_no:eq(1)').text();
 		var thread_container = $(this).parent();
 
@@ -46,7 +46,7 @@ $(document).ready(function(){
 		}
 	
 		$('<a class="hide-thread-link" style="float:left;margin-right:5px" href="javascript:void(0)">[–]</a><span> </span>')
-			.insertBefore(thread_container.find(':first'))
+			.insertBefore(thread_container.find(':not(h2,h2 *):first'))
 			.click(function() {
 				hidden_data[board][id] = Math.round(Date.now() / 1000);
 				store_data();
@@ -69,9 +69,15 @@ $(document).ready(function(){
 						hidden_div.remove();
 					});
 				
-				hidden_div.insertAfter(thread_container.find(':first'));
+				hidden_div.insertAfter(thread_container.find(':not(h2,h2 *):first'));
 			});
 		if (hidden_data[board][id])
 			thread_container.find('.hide-thread-link').click();
+	}
+
+	$('div.post.op').each(do_hide_threads);
+
+	$(document).bind('new_post', function(e, post) {
+		do_hide_threads.call($(post).find('div.post.op')[0]);
 	});
 });
diff --git a/js/show-backlinks.js b/js/show-backlinks.js
index 4ead494b..f23cfc38 100644
--- a/js/show-backlinks.js
+++ b/js/show-backlinks.js
@@ -48,7 +48,12 @@ onready(function(){
 	$('div.post.reply').each(showBackLinks);
 
         $(document).bind('new_post', function(e, post) {
-		showBackLinks.call(post);
+		if ($(post).hasClass("reply")) {
+			showBackLinks.call(post);
+		}
+		else {
+			$(post).find('div.post.reply').each(showBackLinks);
+		}
 	});
 });
 
diff --git a/templates/themes/ukko/ukko.js b/templates/themes/ukko/ukko.js
index dc8ed382..6566335e 100644
--- a/templates/themes/ukko/ukko.js
+++ b/templates/themes/ukko/ukko.js
@@ -10,6 +10,7 @@ $(document).ready(function() {
 				if(thread.length > 0) {
 					thread.prepend('<h2><a href="/' + overflow[0].board + '/">/' + overflow[0].board + '/</a></h2>');
 					$('div[id*="thread_"]').last().after(thread.attr('data-board', overflow[0].board).css('display', 'block'));
+					$(document).trigger('new_post', thread);
 					overflow.shift();
 				}
 			} else {
@@ -25,6 +26,7 @@ $(document).ready(function() {
 					if(thread.length > 0) {
 						thread.prepend('<h2><a href="/' + overflow[0].board + '/">/' + overflow[0].board + '/</a></h2>');
 						$('div[id*="thread_"]').last().after(thread.attr('data-board', overflow[0].board).css('display', 'block'));
+						$(document).trigger('new_post', thread);
 						overflow.shift();
 					}
 
@@ -33,5 +35,4 @@ $(document).ready(function() {
 			}
 		}
 	});
-
 });
-- 
cgit v1.3


From e2b1034f091313e89143d40503d51d67e00f2f98 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Sat, 27 Jul 2013 01:38:03 -0400
Subject: categories theme: fix title displaying twice, put boardlist there
 instead

---
 templates/themes/categories/news.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'templates/themes')

diff --git a/templates/themes/categories/news.html b/templates/themes/categories/news.html
index 9c7d8340..93eb5b72 100644
--- a/templates/themes/categories/news.html
+++ b/templates/themes/categories/news.html
@@ -7,7 +7,7 @@
 	<link rel="stylesheet" media="screen" href="{{ config.url_stylesheet }}"/>
 </head>
 <body>
-	<h1>{{ settings.title }}</h1>
+	{{ boardlist.top }}
 	<header>
 		<h1>{{ settings.title }}</h1>
 		<div class="subtitle">{{ settings.subtitle }}</div>
-- 
cgit v1.3


From b31487b53d4ec715616d40a3aadf6f3fc345d697 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Sat, 27 Jul 2013 01:43:09 -0400
Subject: categories theme: i18n some strings

---
 templates/themes/categories/news.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'templates/themes')

diff --git a/templates/themes/categories/news.html b/templates/themes/categories/news.html
index 93eb5b72..b3bea2b1 100644
--- a/templates/themes/categories/news.html
+++ b/templates/themes/categories/news.html
@@ -15,16 +15,16 @@
 	
 	<div class="ban">
 		{% if news|count == 0 %}
-			<p style="text-align:center" class="unimportant">(No news to show.)</p>
+			<p style="text-align:center" class="unimportant">{% trans %}(No news to show.){% endtrans %}</p>
 		{% else %}
 			{% for entry in news %}
 				<h2 id="{{ entry.id }}">
 					{% if entry.subject %}
 						{{ entry.subject }}
 					{% else %}
-						<em>no subject</em>
+						<em>{% trans %}no subject{% endtrans %}</em>
 					{% endif %}
-					<span class="unimportant"> &mdash; by {{ entry.name }} at {{ entry.time|date(config.post_date) }}</span>
+					<span class="unimportant"> &mdash; {% trans %}by{% endtrans %} {{ entry.name }} {% trans %}at{% endtrans %} {{ entry.time|date(config.post_date) }}</span>
 				</h2>
 				<p>{{ entry.body }}</p>
 			{% endfor %}
-- 
cgit v1.3


From 98187303d77c41fa94430fa1302f071041c58bfc Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Sat, 27 Jul 2013 01:38:03 -0400
Subject: categories theme: fix title displaying twice, put boardlist there
 instead

---
 templates/themes/categories/news.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'templates/themes')

diff --git a/templates/themes/categories/news.html b/templates/themes/categories/news.html
index 9c7d8340..93eb5b72 100644
--- a/templates/themes/categories/news.html
+++ b/templates/themes/categories/news.html
@@ -7,7 +7,7 @@
 	<link rel="stylesheet" media="screen" href="{{ config.url_stylesheet }}"/>
 </head>
 <body>
-	<h1>{{ settings.title }}</h1>
+	{{ boardlist.top }}
 	<header>
 		<h1>{{ settings.title }}</h1>
 		<div class="subtitle">{{ settings.subtitle }}</div>
-- 
cgit v1.3


From cea7881749e85b4ba5c8444e738d42a27d91244f Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Sat, 27 Jul 2013 01:43:09 -0400
Subject: categories theme: i18n some strings

---
 templates/themes/categories/news.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'templates/themes')

diff --git a/templates/themes/categories/news.html b/templates/themes/categories/news.html
index 93eb5b72..b3bea2b1 100644
--- a/templates/themes/categories/news.html
+++ b/templates/themes/categories/news.html
@@ -15,16 +15,16 @@
 	
 	<div class="ban">
 		{% if news|count == 0 %}
-			<p style="text-align:center" class="unimportant">(No news to show.)</p>
+			<p style="text-align:center" class="unimportant">{% trans %}(No news to show.){% endtrans %}</p>
 		{% else %}
 			{% for entry in news %}
 				<h2 id="{{ entry.id }}">
 					{% if entry.subject %}
 						{{ entry.subject }}
 					{% else %}
-						<em>no subject</em>
+						<em>{% trans %}no subject{% endtrans %}</em>
 					{% endif %}
-					<span class="unimportant"> &mdash; by {{ entry.name }} at {{ entry.time|date(config.post_date) }}</span>
+					<span class="unimportant"> &mdash; {% trans %}by{% endtrans %} {{ entry.name }} {% trans %}at{% endtrans %} {{ entry.time|date(config.post_date) }}</span>
 				</h2>
 				<p>{{ entry.body }}</p>
 			{% endfor %}
-- 
cgit v1.3


From 15d2c3e28a4f1590a0a42387dd198eb433ff8580 Mon Sep 17 00:00:00 2001
From: Marcin Łabanowski <marcin@6irc.net>
Date: Wed, 2 Jan 2013 05:49:04 +0100
Subject: Added recent_dark stylesheet for recent template, need to be changed
 currently in style.php though

---
 templates/themes/recent/recent_dark.css | 73 +++++++++++++++++++++++++++++++++
 1 file changed, 73 insertions(+)
 create mode 100644 templates/themes/recent/recent_dark.css

(limited to 'templates/themes')

diff --git a/templates/themes/recent/recent_dark.css b/templates/themes/recent/recent_dark.css
new file mode 100644
index 00000000..c59214ac
--- /dev/null
+++ b/templates/themes/recent/recent_dark.css
@@ -0,0 +1,73 @@
+body {
+    color: #CCCCCC;
+    background: #1E1E1E;
+}
+
+header div.subtitle, h1 {
+    color: #CCCCCC;
+}
+
+a:link, a:visited, p.intro a.email span.name {
+        color: #CCCCCC;
+        text-decoration: underline;
+        font-family: sans-serif;
+}
+a:link:hover, a:visited:hover {
+        color: #FF0000;
+        font-family: sans-serif;
+        text-decoration: underline overline;
+}
+ 
+.box-wrap {
+        max-width: 670px;
+        min-width: 332px;
+        margin: 30px auto;
+        overflow: auto;
+        padding: 0;
+}
+.box {
+        background: white;
+        border: 1px solid #98E;
+        width: 330px;
+        margin: 8px 0;
+        padding: 0;
+}
+.box ul {
+        padding: 2px 15px;
+}
+.box ul li {
+        list-style: none;
+        margin: 0;
+}
+.box.left {
+        background: #333333;
+        color: #CCCCCC;
+        border: #555555 1px solid;
+        float: left;
+}
+.box.right {
+        background: #333333;
+        color: #CCCCCC;
+        border: #555555 1px solid;
+        float: right;
+}
+ 
+.box h2 {
+        padding: 3px 7px;
+        font-size: 12pt;
+        border: #555555 1px solid;
+}
+.box.left h2 {
+        background: #333333;
+        color: #CCCCCC;
+        border: #555555 1px solid;
+}
+.box.right h2 {
+        background: #333333;
+        color: #CCCCCC;
+        border: #555555 1px solid;
+}
+.box img {
+        float: none;
+        margin: 10px auto;
+}
-- 
cgit v1.3


From b01417be444bd3217ae09067c039cc14f3a5593b Mon Sep 17 00:00:00 2001
From: asiekierka <asiekierka@gmail.com>
Date: Sun, 6 Jan 2013 13:40:33 +0100
Subject: added Fluttershy recent theme and theme picker

---
 templates/themes/recent/info.php      |  8 +++++
 templates/themes/recent/recent_fs.css | 57 +++++++++++++++++++++++++++++++++++
 templates/themes/recent/theme.php     |  2 +-
 3 files changed, 66 insertions(+), 1 deletion(-)
 create mode 100644 templates/themes/recent/recent_fs.css

(limited to 'templates/themes')

diff --git a/templates/themes/recent/info.php b/templates/themes/recent/info.php
index d4cf1029..58448b3d 100644
--- a/templates/themes/recent/info.php
+++ b/templates/themes/recent/info.php
@@ -55,6 +55,14 @@
 		'default' => 'recent.css',
 		'comment' => '(eg. "recent.css")'
 	);
+
+	$theme['config'][] = Array(
+		'title' => 'CSS stylesheet name',
+		'name' => 'basecss',
+		'type' => 'text',
+		'default' => 'recent.css',
+		'comment' => '(eg. "recent.css" - see templates/themes/recent for details)'
+	);
 	
 	// Unique function name for building everything
 	$theme['build_function'] = 'recentposts_build';
diff --git a/templates/themes/recent/recent_fs.css b/templates/themes/recent/recent_fs.css
new file mode 100644
index 00000000..26aed668
--- /dev/null
+++ b/templates/themes/recent/recent_fs.css
@@ -0,0 +1,57 @@
+.box-wrap {
+	max-width: 670px;
+	min-width: 332px;
+	margin: 30px auto;
+	overflow: auto;
+	padding: 0;
+}
+.box {
+	background: white;
+	border: 1px solid #98E;
+	width: 330px;
+	margin: 8px 0;
+	padding: 0;
+}
+.box ul {
+	padding: 2px 15px;
+}
+.box ul li {
+	list-style: none;
+	margin: 0;
+}
+.box.left {
+    background: #FDF6AF;
+    color: #9E914F;
+    border: 1px solid #9E914F;
+	float: left;
+}
+.box.right {
+    background: #F2DCE5;
+    color: #525;
+    border: 1px solid #CA759E;
+	float: right;
+}
+
+.box h2 {
+	padding: 3px 7px;
+	font-size: 12pt;
+}
+.box img {
+	float: none;
+	margin: 10px auto;
+}
+.box.left h2 {
+    background: #FEE78F;
+    color: #9E914F;
+}
+.box.right h2 {
+    background: #EB81B4;
+    color: #F8F8F8;
+}
+
+body {
+    background: #F7F8F9;
+}
+header div.subtitle, h1 {
+    color: #888A8C;
+}
diff --git a/templates/themes/recent/theme.php b/templates/themes/recent/theme.php
index 1ebe58f6..75907e77 100644
--- a/templates/themes/recent/theme.php
+++ b/templates/themes/recent/theme.php
@@ -19,7 +19,7 @@
 			global $config, $_theme;
 			
 			if ($action == 'all') {
-				copy('templates/themes/recent/recent.css', $config['dir']['home'] . $settings['css']);
+				copy('templates/themes/recent/' . $settings['basecss'], $config['dir']['home'] . $settings['css']);
 			}
 			
 			$this->excluded = explode(' ', $settings['exclude']);
-- 
cgit v1.3


From 328484bee7cab9ce354121413cc8d96c3e227aea Mon Sep 17 00:00:00 2001
From: Michael Foster <savetheinternet@tinyboard.org>
Date: Wed, 31 Jul 2013 20:51:43 -0400
Subject: SQL cleanup

---
 inc/functions.php                  | 63 +++++++++++++++++++-------------------
 inc/mod/auth.php                   |  2 +-
 inc/mod/pages.php                  | 32 +++++++++----------
 post.php                           | 10 +++---
 templates/themes/catalog/theme.php |  2 +-
 templates/themes/recent/theme.php  | 19 +++++-------
 templates/themes/rrdtool/theme.php |  5 ++-
 7 files changed, 64 insertions(+), 69 deletions(-)

(limited to 'templates/themes')

diff --git a/inc/functions.php b/inc/functions.php
index 7cde156b..0b4ac211 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -243,7 +243,7 @@ function rebuildThemes($action, $board = false) {
 	// List themes
 	$query = query("SELECT `theme` FROM `theme_settings` WHERE `name` IS NULL AND `value` IS NULL") or error(db_error());
 
-	while ($theme = $query->fetch()) {
+	while ($theme = $query->fetch(PDO::FETCH_ASSOC)) {
 		rebuildTheme($theme['theme'], $action, $board);
 	}
 }
@@ -281,7 +281,7 @@ function themeSettings($theme) {
 	$query->execute() or error(db_error($query));
 
 	$settings = array();
-	while ($s = $query->fetch()) {
+	while ($s = $query->fetch(PDO::FETCH_ASSOC)) {
 		$settings[$s['name']] = $s['value'];
 	}
 
@@ -351,7 +351,7 @@ function getBoardInfo($uri) {
 	$query->bindValue(':uri', $uri);
 	$query->execute() or error(db_error($query));
 	
-	if ($board = $query->fetch()) {
+	if ($board = $query->fetch(PDO::FETCH_ASSOC)) {
 		if ($config['cache']['enabled'])
 			cache::set('board_' . $uri, $board);
 		return $board;
@@ -543,7 +543,7 @@ function checkFlood($post) {
 	$query->bindValue(':floodsametime', time()-$config['flood_time_same'], PDO::PARAM_INT);
 	$query->execute() or error(db_error($query));
 	
-	$flood = (bool)$query->fetch();
+	$flood = (bool) $query->fetch(PDO::FETCH_ASSOC);
 	
 	if (event('check-flood', $post))
 		return true;
@@ -647,7 +647,7 @@ function checkBan($board = 0) {
 		$query->execute() or error(db_error($query));
 	}
 	
-	if ($ban = $query->fetch()) {
+	if ($ban = $query->fetch(PDO::FETCH_ASSOC)) {
 		if ($ban['expires'] && $ban['expires'] < time()) {
 			// Ban expired
 			$query = prepare("DELETE FROM `bans` WHERE `id` = :id");
@@ -685,12 +685,12 @@ function threadLocked($id) {
 	$query->bindValue(':id', $id, PDO::PARAM_INT);
 	$query->execute() or error(db_error());
 	
-	if (!$post = $query->fetch()) {
+	if (($locked = $query->fetchColumn()) === false) {
 		// Non-existant, so it can't be locked...
 		return false;
 	}
 	
-	return (bool)$post['locked'];
+	return (bool)$locked;
 }
 
 function threadSageLocked($id) {
@@ -703,12 +703,12 @@ function threadSageLocked($id) {
 	$query->bindValue(':id', $id, PDO::PARAM_INT);
 	$query->execute() or error(db_error());
 	
-	if (!$post = $query->fetch()) {
+	if (($sagelocked = $query->fetchColumn()) === false) {
 		// Non-existant, so it can't be locked...
 		return false;
 	}
 	
-	return (bool) $post['sage'];
+	return (bool)$sagelocked;
 }
 
 function threadExists($id) {
@@ -842,7 +842,7 @@ function deleteFile($id, $remove_entirely_if_already=true) {
 	$query = prepare(sprintf("SELECT `thread`,`thumb`,`file` FROM `posts_%s` WHERE `id` = :id LIMIT 1", $board['uri']));
 	$query->bindValue(':id', $id, PDO::PARAM_INT);
 	$query->execute() or error(db_error($query));
-	if (!$post = $query->fetch())
+	if (!$post = $query->fetch(PDO::FETCH_ASSOC))
 		error($config['error']['invalidpost']);
 	
 	if ($post['file'] == 'deleted' && !$post['thread'])
@@ -880,7 +880,7 @@ function rebuildPost($id) {
 	$query->bindValue(':id', $id, PDO::PARAM_INT);
 	$query->execute() or error(db_error($query));
 	
-	if ((!$post = $query->fetch()) || !$post['body_nomarkup'])
+	if ((!$post = $query->fetch(PDO::FETCH_ASSOC)) || !$post['body_nomarkup'])
 		return false;
 	
 	markup($body = &$post['body_nomarkup']);
@@ -913,7 +913,7 @@ function deletePost($id, $error_if_doesnt_exist=true, $rebuild_after=true) {
 	$ids = array();
 	
 	// Delete posts and maybe replies
-	while ($post = $query->fetch()) {
+	while ($post = $query->fetch(PDO::FETCH_ASSOC)) {
 		if (!$post['thread']) {
 			// Delete thread HTML page
 			file_unlink($board['dir'] . $config['dir']['res'] . sprintf($config['file_page'], $post['id']));
@@ -946,7 +946,7 @@ function deletePost($id, $error_if_doesnt_exist=true, $rebuild_after=true) {
 	$query = prepare("SELECT `board`, `post` FROM `cites` WHERE `target_board` = :board AND (`target` = " . implode(' OR `target` = ', $ids) . ")");
 	$query->bindValue(':board', $board['uri']);
 	$query->execute() or error(db_error($query));
-	while ($cite = $query->fetch()) {
+	while ($cite = $query->fetch(PDO::FETCH_ASSOC)) {
 		if ($board['uri'] != $cite['board']) {
 			if (!isset($tmp_board))
 				$tmp_board = $board['uri'];
@@ -979,7 +979,7 @@ function clean() {
 	$query->bindValue(':offset', $offset, PDO::PARAM_INT);
 	
 	$query->execute() or error(db_error($query));
-	while ($post = $query->fetch()) {
+	while ($post = $query->fetch(PDO::FETCH_ASSOC)) {
 		deletePost($post['id']);
 	}
 }
@@ -1000,7 +1000,7 @@ function index($page, $mod=false) {
 	
 	if ($query->rowCount() < 1 && $page > 1)
 		return false;
-	while ($th = $query->fetch()) {
+	while ($th = $query->fetch(PDO::FETCH_ASSOC)) {
 		$thread = new Thread(
 			$th['id'], $th['subject'], $th['email'], $th['name'], $th['trip'], $th['capcode'], $th['body'], $th['time'], $th['thumb'],
 			$th['thumbwidth'], $th['thumbheight'], $th['file'], $th['filewidth'], $th['fileheight'], $th['filesize'], $th['filename'], $th['ip'],
@@ -1115,7 +1115,7 @@ function getPages($mod=false) {
 		$count = $board['thread_count'];
 	} else {
 		// Count threads
-		$query = query(sprintf("SELECT COUNT(`id`) FROM `posts_%s` WHERE `thread` IS NULL", $board['uri'])) or error(db_error());
+		$query = query(sprintf("SELECT COUNT(*) FROM `posts_%s` WHERE `thread` IS NULL", $board['uri'])) or error(db_error());
 		$count = $query->fetchColumn();
 	}
 	$count = floor(($config['threads_per_page'] + $count - 1) / $config['threads_per_page']);
@@ -1155,7 +1155,7 @@ function checkRobot($body) {
 	$query->bindValue(':hash', $body);
 	$query->execute() or error(db_error($query));
 	
-	if ($query->fetch()) {
+	if ($query->fetchColumn()) {
 		return true;
 	}
 
@@ -1163,20 +1163,19 @@ function checkRobot($body) {
 	$query = prepare("INSERT INTO `robot` VALUES (:hash)");
 	$query->bindValue(':hash', $body);
 	$query->execute() or error(db_error($query));
+	
 	return false;
 }
 
 // Returns an associative array with 'replies' and 'images' keys
 function numPosts($id) {
 	global $board;
-	$query = prepare(sprintf("SELECT COUNT(*) as `num` FROM `posts_%s` WHERE `thread` = :thread UNION ALL SELECT COUNT(*) FROM `posts_%s` WHERE `file` IS NOT NULL AND `thread` = :thread", $board['uri'], $board['uri']));
+	$query = prepare(sprintf("SELECT COUNT(*) FROM `posts_%s` WHERE `thread` = :thread UNION ALL SELECT COUNT(*) FROM `posts_%s` WHERE `file` IS NOT NULL AND `thread` = :thread", $board['uri'], $board['uri']));
 	$query->bindValue(':thread', $id, PDO::PARAM_INT);
 	$query->execute() or error(db_error($query));
 	
-	$num_posts = $query->fetch();
-	$num_posts = $num_posts['num'];
-	$num_images = $query->fetch();
-	$num_images = $num_images['num'];
+	$num_posts = $query->fetchColumn();
+	$num_images = $query->fetchColumn();
 	
 	return array('replies' => $num_posts, 'images' => $num_images);
 }
@@ -1188,14 +1187,14 @@ function muteTime() {
 		return $time;
 	
 	// Find number of mutes in the past X hours
-	$query = prepare("SELECT COUNT(*) as `count` FROM `mutes` WHERE `time` >= :time AND `ip` = :ip");
+	$query = prepare("SELECT COUNT(*) FROM `mutes` WHERE `time` >= :time AND `ip` = :ip");
 	$query->bindValue(':time', time()-($config['robot_mute_hour']*3600), PDO::PARAM_INT);
 	$query->bindValue(':ip', $_SERVER['REMOTE_ADDR']);
 	$query->execute() or error(db_error($query));
 	
-	$result = $query->fetch();
-	if ($result['count'] == 0) return 0;
-	return pow($config['robot_mute_multiplier'], $result['count']);
+	if (!$result = $query->fetchColumn())
+		return 0;
+	return pow($config['robot_mute_multiplier'], $result);
 }
 
 function mute() {
@@ -1225,7 +1224,7 @@ function checkMute() {
 		$query->bindValue(':ip', $_SERVER['REMOTE_ADDR']);
 		$query->execute() or error(db_error($query));
 		
-		if (!$mute = $query->fetch()) {
+		if (!$mute = $query->fetch(PDO::FETCH_ASSOC)) {
 			// What!? He's muted but he's not muted...
 			return;
 		}
@@ -1514,7 +1513,7 @@ function markup(&$body, $track_cites = false) {
 				$match[1] = mb_strlen(substr($body_tmp, 0, $match[1]));
 			}
 			
-			if ($post = $query->fetch()) {
+			if ($post = $query->fetch(PDO::FETCH_ASSOC)) {
 				$replacement = '<a onclick="highlightReply(\''.$cite.'\');" href="' .
 					$config['root'] . $board['dir'] . $config['dir']['res'] . ($post['thread']?$post['thread']:$post['id']) . '.html#' . $cite . '">' .
 						'&gt;&gt;' . $cite .
@@ -1557,7 +1556,7 @@ function markup(&$body, $track_cites = false) {
 					$query->bindValue(':id', $cite);
 					$query->execute() or error(db_error($query));
 					
-					if ($post = $query->fetch()) {
+					if ($post = $query->fetch(PDO::FETCH_ASSOC)) {
 						$replacement = '<a onclick="highlightReply(\''.$cite.'\');" href="' .
 							$config['root'] . $board['dir'] . $config['dir']['res'] . ($post['thread']?$post['thread']:$post['id']) . '.html#' . $cite . '">' .
 								'&gt;&gt;&gt;/' . $_board . '/' . $cite .
@@ -1666,7 +1665,7 @@ function buildThread($id, $return = false, $mod = false) {
 	$query->bindValue(':id', $id, PDO::PARAM_INT);
 	$query->execute() or error(db_error($query));
 	
-	while ($post = $query->fetch()) {
+	while ($post = $query->fetch(PDO::FETCH_ASSOC)) {
 		if (!isset($thread)) {
 			$thread = new Thread(
 				$post['id'], $post['subject'], $post['email'], $post['name'], $post['trip'], $post['capcode'], $post['body'], $post['time'],
@@ -1801,7 +1800,7 @@ function getPostByHash($hash) {
 	$query->bindValue(':hash', $hash, PDO::PARAM_STR);
 	$query->execute() or error(db_error($query));
 	
-	if ($post = $query->fetch()) {
+	if ($post = $query->fetch(PDO::FETCH_ASSOC)) {
 		return $post;
 	}
 	
@@ -1815,7 +1814,7 @@ function getPostByHashInThread($hash, $thread) {
 	$query->bindValue(':thread', $thread, PDO::PARAM_INT);
 	$query->execute() or error(db_error($query));
 	
-	if ($post = $query->fetch()) {
+	if ($post = $query->fetch(PDO::FETCH_ASSOC)) {
 		return $post;
 	}
 	
diff --git a/inc/mod/auth.php b/inc/mod/auth.php
index 1bc27dff..a0986a1f 100644
--- a/inc/mod/auth.php
+++ b/inc/mod/auth.php
@@ -147,7 +147,7 @@ function create_pm_header() {
 	$query->bindValue(':id', $mod['id'], PDO::PARAM_INT);
 	$query->execute() or error(db_error($query));
 	
-	if ($pm = $query->fetch())
+	if ($pm = $query->fetch(PDO::FETCH_ASSOC))
 		$header = array('id' => $pm['id'], 'waiting' => $query->rowCount() - 1);
 	else
 		$header = true;
diff --git a/inc/mod/pages.php b/inc/mod/pages.php
index 351d3203..f5b1101d 100644
--- a/inc/mod/pages.php
+++ b/inc/mod/pages.php
@@ -96,14 +96,14 @@ function mod_dashboard() {
 		$query = prepare('SELECT COUNT(*) FROM `pms` WHERE `to` = :id AND `unread` = 1');
 		$query->bindValue(':id', $mod['id']);
 		$query->execute() or error(db_error($query));
-		$args['unread_pms'] = $query->fetchColumn(0);
+		$args['unread_pms'] = $query->fetchColumn();
 		
 		if ($config['cache']['enabled'])
 			cache::set('pm_unreadcount_' . $mod['id'], $args['unread_pms']);
 	}
 	
 	$query = query('SELECT COUNT(*) FROM `reports`') or error(db_error($query));
-	$args['reports'] = $query->fetchColumn(0);
+	$args['reports'] = $query->fetchColumn();
 	
 	if ($mod['type'] >= ADMIN && $config['check_updates']) {
 		if (!$config['version'])
@@ -536,7 +536,7 @@ function mod_noticeboard($page_no = 1) {
 	
 	$query = prepare("SELECT COUNT(*) FROM `noticeboard`");
 	$query->execute() or error(db_error($query));
-	$count = $query->fetchColumn(0);
+	$count = $query->fetchColumn();
 	
 	mod_page(_('Noticeboard'), 'mod/noticeboard.html', array('noticeboard' => $noticeboard, 'count' => $count));
 }
@@ -597,7 +597,7 @@ function mod_news($page_no = 1) {
 	
 	$query = prepare("SELECT COUNT(*) FROM `news`");
 	$query->execute() or error(db_error($query));
-	$count = $query->fetchColumn(0);
+	$count = $query->fetchColumn();
 	
 	mod_page(_('News'), 'mod/news.html', array('news' => $news, 'count' => $count));
 }
@@ -637,7 +637,7 @@ function mod_log($page_no = 1) {
 	
 	$query = prepare("SELECT COUNT(*) FROM `modlogs`");
 	$query->execute() or error(db_error($query));
-	$count = $query->fetchColumn(0);
+	$count = $query->fetchColumn();
 	
 	mod_page(_('Moderation log'), 'mod/log.html', array('logs' => $logs, 'count' => $count));
 }
@@ -664,7 +664,7 @@ function mod_user_log($username, $page_no = 1) {
 	$query = prepare("SELECT COUNT(*) FROM `modlogs` LEFT JOIN `mods` ON `mod` = `mods`.`id` WHERE `username` = :username");
 	$query->bindValue(':username', $username);
 	$query->execute() or error(db_error($query));
-	$count = $query->fetchColumn(0);
+	$count = $query->fetchColumn();
 	
 	mod_page(_('Moderation log'), 'mod/log.html', array('logs' => $logs, 'count' => $count, 'username' => $username));
 }
@@ -906,7 +906,7 @@ function mod_bans($page_no = 1) {
 	
 	$query = prepare("SELECT COUNT(*) FROM `bans`");
 	$query->execute() or error(db_error($query));
-	$count = $query->fetchColumn(0);
+	$count = $query->fetchColumn();
 	
 	foreach ($bans as &$ban) {
 		if (filter_var($ban['ip'], FILTER_VALIDATE_IP) !== false)
@@ -1058,7 +1058,7 @@ function mod_move($originBoard, $postID) {
 		
 		$replies = array();
 		
-		while ($post = $query->fetch()) {
+		while ($post = $query->fetch(PDO::FETCH_ASSOC)) {
 			$post['mod'] = true;
 			$post['thread'] = $newID;
 			
@@ -1365,7 +1365,7 @@ function mod_deletebyip($boardName, $post, $global = false) {
 	$query = prepare(sprintf('SELECT `ip` FROM `posts_%s` WHERE `id` = :id', $boardName));
 	$query->bindValue(':id', $post);
 	$query->execute() or error(db_error($query));
-	if (!$ip = $query->fetchColumn(0))
+	if (!$ip = $query->fetchColumn())
 		error($config['error']['invalidpost']);
 	
 	$boards = $global ? listBoards() : array(array('uri' => $boardName));
@@ -1387,7 +1387,7 @@ function mod_deletebyip($boardName, $post, $global = false) {
 	
 	$threads_to_rebuild = array();
 	$threads_deleted = array();
-	while ($post = $query->fetch()) {
+	while ($post = $query->fetch(PDO::FETCH_ASSOC)) {
 		openBoard($post['board']);
 		
 		deletePost($post['id'], false, false);
@@ -1684,7 +1684,7 @@ function mod_inbox() {
 	$query = prepare('SELECT COUNT(*) FROM `pms` WHERE `to` = :mod AND `unread` = 1');
 	$query->bindValue(':mod', $mod['id']);
 	$query->execute() or error(db_error($query));
-	$unread = $query->fetchColumn(0);
+	$unread = $query->fetchColumn();
 	
 	foreach ($messages as &$message) {
 		$message['snippet'] = pm_snippet($message['message']);
@@ -1706,12 +1706,12 @@ function mod_new_pm($username) {
 	$query = prepare("SELECT `id` FROM `mods` WHERE `username` = :username");
 	$query->bindValue(':username', $username);
 	$query->execute() or error(db_error($query));
-	if (!$id = $query->fetchColumn(0)) {
+	if (!$id = $query->fetchColumn()) {
 		// Old style ?/PM: by user ID
 		$query = prepare("SELECT `username` FROM `mods` WHERE `id` = :username");
 		$query->bindValue(':username', $username);
 		$query->execute() or error(db_error($query));
-		if ($username = $query->fetchColumn(0))
+		if ($username = $query->fetchColumn())
 			header('Location: ?/new_PM/' . $username, true, $config['redirect_http']);
 		else
 			error($config['error']['404']);
@@ -1832,7 +1832,7 @@ function mod_reports() {
 		$report_posts[$board] = array();
 		
 		$query = query(sprintf('SELECT * FROM `posts_%s` WHERE `id` = ' . implode(' OR `id` = ', $posts), $board)) or error(db_error());
-		while ($post = $query->fetch()) {
+		while ($post = $query->fetch(PDO::FETCH_ASSOC)) {
 			$report_posts[$board][$post['id']] = $post;
 		}
 	}
@@ -2169,10 +2169,10 @@ function mod_debug_antispam() {
 	}
 	
 	$query = query('SELECT COUNT(*) FROM `antispam`' . ($where ? " WHERE $where" : '')) or error(db_error());
-	$args['total'] = number_format($query->fetchColumn(0));
+	$args['total'] = number_format($query->fetchColumn());
 	
 	$query = query('SELECT COUNT(*) FROM `antispam` WHERE `expires` IS NOT NULL' . ($where ? " AND $where" : '')) or error(db_error());
-	$args['expiring'] = number_format($query->fetchColumn(0));
+	$args['expiring'] = number_format($query->fetchColumn());
 	
 	$query = query('SELECT * FROM `antispam` ' . ($where ? "WHERE $where" : '') . ' ORDER BY `passed` DESC LIMIT 40') or error(db_error());
 	$args['top'] = $query->fetchAll(PDO::FETCH_ASSOC);
diff --git a/post.php b/post.php
index db077866..f4499845 100644
--- a/post.php
+++ b/post.php
@@ -52,7 +52,7 @@ if (isset($_POST['delete'])) {
 		$query->bindValue(':id', $id, PDO::PARAM_INT);
 		$query->execute() or error(db_error($query));
 		
-		if ($post = $query->fetch()) {
+		if ($post = $query->fetch(PDO::FETCH_ASSOC)) {
 			if ($password != '' && $post['password'] != $password)
 				error($config['error']['invalidpassword']);
 			
@@ -115,12 +115,12 @@ if (isset($_POST['delete'])) {
 		$query->bindValue(':id', $id, PDO::PARAM_INT);
 		$query->execute() or error(db_error($query));
 		
-		$post = $query->fetch();
+		$thread = $query->fetchColumn();
 		
-		if ($post) {
+		if ($thread) {
 			if ($config['syslog'])
 				_syslog(LOG_INFO, 'Reported post: ' .
-					'/' . $board['dir'] . $config['dir']['res'] . sprintf($config['file_page'], $post['thread'] ? $post['thread'] : $id) . ($post['thread'] ? '#' . $id : '') .
+					'/' . $board['dir'] . $config['dir']['res'] . sprintf($config['file_page'], $thread ? $thread : $id) . ($thread ? '#' . $id : '') .
 					' for "' . $reason . '"'
 				);
 			$query = prepare("INSERT INTO `reports` VALUES (NULL, :time, :ip, :board, :post, :reason)");
@@ -231,7 +231,7 @@ if (isset($_POST['delete'])) {
 		$query->bindValue(':id', $post['thread'], PDO::PARAM_INT);
 		$query->execute() or error(db_error());
 		
-		if (!$thread = $query->fetch()) {
+		if (!$thread = $query->fetch(PDO::FETCH_ASSOC)) {
 			// Non-existant
 			error($config['error']['nonexistant']);
 		}
diff --git a/templates/themes/catalog/theme.php b/templates/themes/catalog/theme.php
index e585cf17..5c9f6769 100644
--- a/templates/themes/catalog/theme.php
+++ b/templates/themes/catalog/theme.php
@@ -39,7 +39,7 @@
 			
 			$query = query(sprintf("SELECT *, `id` AS `thread_id`, (SELECT COUNT(*) FROM `posts_%s` WHERE `thread` = `thread_id`) AS `reply_count`, '%s' AS `board` FROM `posts_%s` WHERE `thread` IS NULL ORDER BY `bump` DESC", $board_name, $board_name, $board_name)) or error(db_error());
 			
-			while ($post = $query->fetch()) {
+			while ($post = $query->fetch(PDO::FETCH_ASSOC)) {
 				$post['link'] = $config['root'] . $board['dir'] . $config['dir']['res'] . sprintf($config['file_page'], ($post['thread'] ? $post['thread'] : $post['id']));
 				$post['board_name'] = $board['name'];
 				$post['file'] = $config['uri_thumb'] . $post['thumb'];
diff --git a/templates/themes/recent/theme.php b/templates/themes/recent/theme.php
index 75907e77..98fabfa1 100644
--- a/templates/themes/recent/theme.php
+++ b/templates/themes/recent/theme.php
@@ -47,7 +47,7 @@
 			$query = preg_replace('/UNION ALL $/', 'ORDER BY `time` DESC LIMIT ' . (int)$settings['limit_images'], $query);
 			$query = query($query) or error(db_error());
 			
-			while ($post = $query->fetch()) {
+			while ($post = $query->fetch(PDO::FETCH_ASSOC)) {
 				openBoard($post['board']);
 				
 				// board settings won't be available in the template file, so generate links now
@@ -67,7 +67,7 @@
 			$query = preg_replace('/UNION ALL $/', 'ORDER BY `time` DESC LIMIT ' . (int)$settings['limit_posts'], $query);
 			$query = query($query) or error(db_error());
 			
-			while ($post = $query->fetch()) {
+			while ($post = $query->fetch(PDO::FETCH_ASSOC)) {
 				openBoard($post['board']);
 				
 				$post['link'] = $config['root'] . $board['dir'] . $config['dir']['res'] . sprintf($config['file_page'], ($post['thread'] ? $post['thread'] : $post['id'])) . '#' . $post['id'];
@@ -78,7 +78,7 @@
 			}
 			
 			// Total posts
-			$query = 'SELECT SUM(`top`) AS `count` FROM (';
+			$query = 'SELECT SUM(`top`) FROM (';
 			foreach ($boards as &$_board) {
 				if (in_array($_board['uri'], $this->excluded))
 					continue;
@@ -86,11 +86,10 @@
 			}
 			$query = preg_replace('/UNION ALL $/', ') AS `posts_all`', $query);
 			$query = query($query) or error(db_error());
-			$res = $query->fetch();
-			$stats['total_posts'] = number_format($res['count']);
+			$stats['total_posts'] = number_format($query->fetchColumn());
 			
 			// Unique IPs
-			$query = 'SELECT COUNT(DISTINCT(`ip`)) AS `count` FROM (';
+			$query = 'SELECT COUNT(DISTINCT(`ip`)) FROM (';
 			foreach ($boards as &$_board) {
 				if (in_array($_board['uri'], $this->excluded))
 					continue;
@@ -98,11 +97,10 @@
 			}
 			$query = preg_replace('/UNION ALL $/', ') AS `posts_all`', $query);
 			$query = query($query) or error(db_error());
-			$res = $query->fetch();
-			$stats['unique_posters'] = number_format($res['count']);
+			$stats['unique_posters'] = number_format($query->fetchColumn());
 			
 			// Active content
-			$query = 'SELECT SUM(`filesize`) AS `count` FROM (';
+			$query = 'SELECT SUM(`filesize`) FROM (';
 			foreach ($boards as &$_board) {
 				if (in_array($_board['uri'], $this->excluded))
 					continue;
@@ -110,8 +108,7 @@
 			}
 			$query = preg_replace('/UNION ALL $/', ') AS `posts_all`', $query);
 			$query = query($query) or error(db_error());
-			$res = $query->fetch();
-			$stats['active_content'] = $res['count'];
+			$stats['active_content'] = $query->fetchColumn();
 			
 			return Element('themes/recent/recent.html', Array(
 				'settings' => $settings,
diff --git a/templates/themes/rrdtool/theme.php b/templates/themes/rrdtool/theme.php
index 68fc1850..0e0a2f15 100644
--- a/templates/themes/rrdtool/theme.php
+++ b/templates/themes/rrdtool/theme.php
@@ -61,9 +61,8 @@
 					// debug just the graphing (not updating) with the --debug switch
 					if (!isset($argv[1]) || $argv[1] != '--debug') {
 						// Update graph
-						$query = query(sprintf("SELECT MAX(`id`) AS `count` FROM `posts_%s`", $board));
-						$count = $query->fetch();
-						$count = $count['count'];
+						$query = query(sprintf("SELECT MAX(`id`) FROM `posts_%s`", $board));
+						$count = $query->fetchColumn();
 					
 						if (!rrd_update($file, Array(
 							'-t',
-- 
cgit v1.3


From a052a791b553c770ef407f91b697bef7a62df5b1 Mon Sep 17 00:00:00 2001
From: Michael Foster <savetheinternet@tinyboard.org>
Date: Wed, 31 Jul 2013 22:14:26 -0400
Subject: Add optional database table prefix (issue #118; see issue comments
 for details)

---
 inc/anti-bot.php                      |  12 +--
 inc/config.php                        |   2 +
 inc/database.php                      |   4 +
 inc/filters.php                       |   2 +-
 inc/functions.php                     |  80 +++++++--------
 inc/mod/auth.php                      |   8 +-
 inc/mod/ban.php                       |   6 +-
 inc/mod/pages.php                     | 188 +++++++++++++++++-----------------
 install.php                           |   6 +-
 post.php                              |  10 +-
 templates/posts.sql                   |   2 +-
 templates/themes/basic/theme.php      |   2 +-
 templates/themes/catalog/theme.php    |   2 +-
 templates/themes/categories/theme.php |   2 +-
 templates/themes/frameset/theme.php   |   2 +-
 templates/themes/recent/theme.php     |  10 +-
 templates/themes/rrdtool/theme.php    |   2 +-
 templates/themes/sitemap/theme.php    |   2 +-
 18 files changed, 177 insertions(+), 165 deletions(-)

(limited to 'templates/themes')

diff --git a/inc/anti-bot.php b/inc/anti-bot.php
index bf29b3cb..fde97096 100644
--- a/inc/anti-bot.php
+++ b/inc/anti-bot.php
@@ -182,12 +182,12 @@ function _create_antibot($board, $thread) {
 	
 	$antibot = new AntiBot(array($board, $thread));
 	
-	query('DELETE FROM `antispam` WHERE `expires` < UNIX_TIMESTAMP()') or error(db_error());
+	query('DELETE FROM ``antispam`` WHERE `expires` < UNIX_TIMESTAMP()') or error(db_error());
 	
 	if ($thread)
-		$query = prepare('UPDATE `antispam` SET `expires` = UNIX_TIMESTAMP() + :expires WHERE `board` = :board AND `thread` = :thread AND `expires` IS NULL');
+		$query = prepare('UPDATE ``antispam`` SET `expires` = UNIX_TIMESTAMP() + :expires WHERE `board` = :board AND `thread` = :thread AND `expires` IS NULL');
 	else
-		$query = prepare('UPDATE `antispam` SET `expires` = UNIX_TIMESTAMP() + :expires WHERE `board` = :board AND `thread` IS NULL AND `expires` IS NULL');
+		$query = prepare('UPDATE ``antispam`` SET `expires` = UNIX_TIMESTAMP() + :expires WHERE `board` = :board AND `thread` IS NULL AND `expires` IS NULL');
 	
 	$query->bindValue(':board', $board);
 	if ($thread)
@@ -195,7 +195,7 @@ function _create_antibot($board, $thread) {
 	$query->bindValue(':expires', $config['spam']['hidden_inputs_expire']);
 	$query->execute() or error(db_error($query));
 	
-	$query = prepare('INSERT INTO `antispam` VALUES (:board, :thread, :hash, UNIX_TIMESTAMP(), NULL, 0)');
+	$query = prepare('INSERT INTO ``antispam`` VALUES (:board, :thread, :hash, UNIX_TIMESTAMP(), NULL, 0)');
 	$query->bindValue(':board', $board);
 	$query->bindValue(':thread', $thread);
 	$query->bindValue(':hash', $antibot->hash());
@@ -248,7 +248,7 @@ function checkSpam(array $extra_salt = array()) {
 	if ($hash != $_hash)
 		return true;
 
-	$query = prepare('SELECT `passed` FROM `antispam` WHERE `hash` = :hash');
+	$query = prepare('SELECT `passed` FROM ``antispam`` WHERE `hash` = :hash');
 	$query->bindValue(':hash', $hash);
 	$query->execute() or error(db_error($query));
 	if ((($passed = $query->fetchColumn(0)) === false) || ($passed > $config['spam']['hidden_inputs_max_pass'])) {
@@ -260,7 +260,7 @@ function checkSpam(array $extra_salt = array()) {
 }
 
 function incrementSpamHash($hash) {
-	$query = prepare('UPDATE `antispam` SET `passed` = `passed` + 1 WHERE `hash` = :hash');
+	$query = prepare('UPDATE ``antispam`` SET `passed` = `passed` + 1 WHERE `hash` = :hash');
 	$query->bindValue(':hash', $hash);
 	$query->execute() or error(db_error($query));
 }
diff --git a/inc/config.php b/inc/config.php
index 6f2371ec..75384d3f 100644
--- a/inc/config.php
+++ b/inc/config.php
@@ -76,6 +76,8 @@
 	$config['db']['password'] = '';
 	// Tinyboard database
 	$config['db']['database'] = '';
+	// Table prefix
+	$config['db']['prefix'] = '';
 	// Use a persistent connection (experimental)
 	$config['db']['persistent'] = false;
 	// Anything more to add to the DSN string (eg. port=xxx;foo=bar)
diff --git a/inc/database.php b/inc/database.php
index 3dc0f0ce..7be001ea 100644
--- a/inc/database.php
+++ b/inc/database.php
@@ -87,6 +87,8 @@ function mysql_version() {
 function prepare($query) {
 	global $pdo, $debug, $config;
 	
+	$query = preg_replace('/``([0-9a-zA-Z$_\x{0080}-\x{FFFF}]+)``/u', '`' . $config['db']['prefix'] . '$1`', $query);
+	
 	sql_open();
 	
 	if ($config['debug'])
@@ -98,6 +100,8 @@ function prepare($query) {
 function query($query) {
 	global $pdo, $debug, $config;
 	
+	$query = preg_replace('/``([0-9a-zA-Z$_\x{0080}-\x{FFFF}]+)``/u', '`' . $config['db']['prefix'] . '$1`', $query);
+	
 	sql_open();
 	
 	if ($config['debug']) {
diff --git a/inc/filters.php b/inc/filters.php
index 524d37cf..9f03154d 100644
--- a/inc/filters.php
+++ b/inc/filters.php
@@ -81,7 +81,7 @@ class Filter {
 				else
 					$all_boards = false;
 				
-				$query = prepare("INSERT INTO `bans` VALUES (NULL, :ip, :mod, :set, :expires, :reason, :board, 0)");
+				$query = prepare("INSERT INTO ``bans`` VALUES (NULL, :ip, :mod, :set, :expires, :reason, :board, 0)");
 				$query->bindValue(':ip', $_SERVER['REMOTE_ADDR']);
 				$query->bindValue(':mod', -1);
 				$query->bindValue(':set', time());
diff --git a/inc/functions.php b/inc/functions.php
index 403f6112..e871fee0 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -241,7 +241,7 @@ function create_antibot($board, $thread = null) {
 
 function rebuildThemes($action, $board = false) {
 	// List themes
-	$query = query("SELECT `theme` FROM `theme_settings` WHERE `name` IS NULL AND `value` IS NULL") or error(db_error());
+	$query = query("SELECT `theme` FROM ``theme_settings`` WHERE `name` IS NULL AND `value` IS NULL") or error(db_error());
 
 	while ($theme = $query->fetch(PDO::FETCH_ASSOC)) {
 		rebuildTheme($theme['theme'], $action, $board);
@@ -276,7 +276,7 @@ function rebuildTheme($theme, $action, $board = false) {
 
 
 function themeSettings($theme) {
-	$query = prepare("SELECT `name`, `value` FROM `theme_settings` WHERE `theme` = :theme AND `name` IS NOT NULL");
+	$query = prepare("SELECT `name`, `value` FROM ``theme_settings`` WHERE `theme` = :theme AND `name` IS NOT NULL");
 	$query->bindValue(':theme', $theme);
 	$query->execute() or error(db_error($query));
 
@@ -347,7 +347,7 @@ function getBoardInfo($uri) {
 		return $board;
 	}
 	
-	$query = prepare("SELECT * FROM `boards` WHERE `uri` = :uri LIMIT 1");
+	$query = prepare("SELECT * FROM ``boards`` WHERE `uri` = :uri LIMIT 1");
 	$query->bindValue(':uri', $uri);
 	$query->execute() or error(db_error($query));
 	
@@ -523,7 +523,7 @@ function listBoards() {
 	if ($config['cache']['enabled'] && ($boards = cache::get('all_boards')))
 		return $boards;
 	
-	$query = query("SELECT * FROM `boards` ORDER BY `uri`") or error(db_error());
+	$query = query("SELECT * FROM ``boards`` ORDER BY `uri`") or error(db_error());
 	$boards = $query->fetchAll();
 	
 	if ($config['cache']['enabled'])
@@ -535,7 +535,7 @@ function listBoards() {
 function checkFlood($post) {
 	global $board, $config;
 	
-	$query = prepare(sprintf("SELECT * FROM `posts_%s` WHERE (`ip` = :ip AND `time` >= :floodtime) OR (`ip` = :ip AND `body` != '' AND `body` = :body AND `time` >= :floodsameiptime) OR (`body` != ''  AND `body` = :body AND `time` >= :floodsametime) LIMIT 1", $board['uri']));
+	$query = prepare(sprintf("SELECT * FROM ``posts_%s`` WHERE (`ip` = :ip AND `time` >= :floodtime) OR (`ip` = :ip AND `body` != '' AND `body` = :body AND `time` >= :floodsameiptime) OR (`body` != ''  AND `body` = :body AND `time` >= :floodsametime) LIMIT 1", $board['uri']));
 	$query->bindValue(':ip', $_SERVER['REMOTE_ADDR']);
 	$query->bindValue(':body', $post['body']);
 	$query->bindValue(':floodtime', time()-$config['flood_time'], PDO::PARAM_INT);
@@ -589,7 +589,7 @@ function displayBan($ban) {
 	global $config;
 	
 	if (!$ban['seen']) {
-		$query = prepare("UPDATE `bans` SET `seen` = 1 WHERE `id` = :id");
+		$query = prepare("UPDATE ``bans`` SET `seen` = 1 WHERE `id` = :id");
 		$query->bindValue(':id', $ban['id'], PDO::PARAM_INT);
 		$query->execute() or error(db_error($query));
 	}
@@ -620,12 +620,12 @@ function checkBan($board = 0) {
 	if (event('check-ban', $board))
 		return true;
 	
-	$query = prepare("SELECT `set`, `expires`, `reason`, `board`, `seen`, `bans`.`id` FROM `bans` WHERE (`board` IS NULL OR `board` = :board) AND `ip` = :ip ORDER BY `expires` IS NULL DESC, `expires` DESC, `expires` DESC LIMIT 1");
+	$query = prepare("SELECT `set`, `expires`, `reason`, `board`, `seen`, ``bans``.`id` FROM ``bans`` WHERE (`board` IS NULL OR `board` = :board) AND `ip` = :ip ORDER BY `expires` IS NULL DESC, `expires` DESC, `expires` DESC LIMIT 1");
 	$query->bindValue(':ip', $_SERVER['REMOTE_ADDR']);
 	$query->bindValue(':board', $board);
 	$query->execute() or error(db_error($query));
 	if ($query->rowCount() < 1 && $config['ban_range']) {
-		$query = prepare("SELECT `set`, `expires`, `reason`, `board`, `seen`, `bans`.`id` FROM `bans` WHERE (`board` IS NULL OR `board` = :board) AND :ip LIKE REPLACE(REPLACE(`ip`, '%', '!%'), '*', '%') ESCAPE '!' ORDER BY `expires` IS NULL DESC, `expires` DESC LIMIT 1");
+		$query = prepare("SELECT `set`, `expires`, `reason`, `board`, `seen`, ``bans``.`id` FROM ``bans`` WHERE (`board` IS NULL OR `board` = :board) AND :ip LIKE REPLACE(REPLACE(`ip`, '%', '!%'), '*', '%') ESCAPE '!' ORDER BY `expires` IS NULL DESC, `expires` DESC LIMIT 1");
 		$query->bindValue(':ip', $_SERVER['REMOTE_ADDR']);
 		$query->bindValue(':board', $board);
 		$query->execute() or error(db_error($query));
@@ -633,7 +633,7 @@ function checkBan($board = 0) {
 	
 	if ($query->rowCount() < 1 && $config['ban_cidr'] && !isIPv6()) {
 		// my most insane SQL query yet
-		$query = prepare("SELECT `set`, `expires`, `reason`, `board`, `seen`, `bans`.`id` FROM `bans` WHERE (`board` IS NULL OR `board` = :board)
+		$query = prepare("SELECT `set`, `expires`, `reason`, `board`, `seen`, ``bans``.`id` FROM ``bans`` WHERE (`board` IS NULL OR `board` = :board)
 			AND (					
 				`ip` REGEXP '^(\[0-9]+\.\[0-9]+\.\[0-9]+\.\[0-9]+\)\/(\[0-9]+)$'
 					AND
@@ -650,7 +650,7 @@ function checkBan($board = 0) {
 	if ($ban = $query->fetch(PDO::FETCH_ASSOC)) {
 		if ($ban['expires'] && $ban['expires'] < time()) {
 			// Ban expired
-			$query = prepare("DELETE FROM `bans` WHERE `id` = :id");
+			$query = prepare("DELETE FROM ``bans`` WHERE `id` = :id");
 			$query->bindValue(':id', $ban['id'], PDO::PARAM_INT);
 			$query->execute() or error(db_error($query));
 			
@@ -670,7 +670,7 @@ function checkBan($board = 0) {
 
 // No reason to keep expired bans in the database (except those that haven't been viewed yet)
 function purge_bans() {
-	$query = prepare("DELETE FROM `bans` WHERE `expires` IS NOT NULL AND `expires` < :time AND `seen` = 1");
+	$query = prepare("DELETE FROM ``bans`` WHERE `expires` IS NOT NULL AND `expires` < :time AND `seen` = 1");
 	$query->bindValue(':time', time());
 	$query->execute() or error(db_error($query));
 }
@@ -681,7 +681,7 @@ function threadLocked($id) {
 	if (event('check-locked', $id))
 		return true;
 	
-	$query = prepare(sprintf("SELECT `locked` FROM `posts_%s` WHERE `id` = :id AND `thread` IS NULL LIMIT 1", $board['uri']));
+	$query = prepare(sprintf("SELECT `locked` FROM ``posts_%s`` WHERE `id` = :id AND `thread` IS NULL LIMIT 1", $board['uri']));
 	$query->bindValue(':id', $id, PDO::PARAM_INT);
 	$query->execute() or error(db_error());
 	
@@ -699,7 +699,7 @@ function threadSageLocked($id) {
 	if (event('check-sage-locked', $id))
 		return true;
 	
-	$query = prepare(sprintf("SELECT `sage` FROM `posts_%s` WHERE `id` = :id AND `thread` IS NULL LIMIT 1", $board['uri']));
+	$query = prepare(sprintf("SELECT `sage` FROM ``posts_%s`` WHERE `id` = :id AND `thread` IS NULL LIMIT 1", $board['uri']));
 	$query->bindValue(':id', $id, PDO::PARAM_INT);
 	$query->execute() or error(db_error());
 	
@@ -714,7 +714,7 @@ function threadSageLocked($id) {
 function threadExists($id) {
 	global $board;
 	
-	$query = prepare(sprintf("SELECT 1 FROM `posts_%s` WHERE `id` = :id AND `thread` IS NULL LIMIT 1", $board['uri']));
+	$query = prepare(sprintf("SELECT 1 FROM ``posts_%s`` WHERE `id` = :id AND `thread` IS NULL LIMIT 1", $board['uri']));
 	$query->bindValue(':id', $id, PDO::PARAM_INT);
 	$query->execute() or error(db_error());
 	
@@ -727,7 +727,7 @@ function threadExists($id) {
 
 function post(array $post) {
 	global $pdo, $board;
-	$query = prepare(sprintf("INSERT INTO `posts_%s` (`id`, `thread`, `subject`, `email`, `name`, `trip`, `capcode`, `body`, `body_nomarkup`, `time`, `bump`, `thumb`, `thumbwidth`, `thumbheight`, `file`, `filewidth`, `fileheight`, `filesize`, `filename`, `filehash`, `password`, `ip`, `sticky`, `locked`, `sage`, `embed`) VALUES ( NULL, :thread, :subject, :email, :name, :trip, :capcode, :body, :body_nomarkup, :time, :time, :thumb, :thumbwidth, :thumbheight, :file, :width, :height, :filesize, :filename, :filehash, :password, :ip, :sticky, :locked, 0, :embed)", $board['uri']));
+	$query = prepare(sprintf("INSERT INTO ``posts_%s`` VALUES ( NULL, :thread, :subject, :email, :name, :trip, :capcode, :body, :body_nomarkup, :time, :time, :thumb, :thumbwidth, :thumbheight, :file, :width, :height, :filesize, :filename, :filehash, :password, :ip, :sticky, :locked, 0, :embed)", $board['uri']));
 	
 	// Basic stuff
 	if (!empty($post['subject'])) {
@@ -829,7 +829,7 @@ function bumpThread($id) {
 	if (event('bump', $id))
 		return true;
 	
-	$query = prepare(sprintf("UPDATE `posts_%s` SET `bump` = :time WHERE `id` = :id AND `thread` IS NULL", $board['uri']));
+	$query = prepare(sprintf("UPDATE ``posts_%s`` SET `bump` = :time WHERE `id` = :id AND `thread` IS NULL", $board['uri']));
 	$query->bindValue(':time', time(), PDO::PARAM_INT);
 	$query->bindValue(':id', $id, PDO::PARAM_INT);
 	$query->execute() or error(db_error($query));
@@ -839,7 +839,7 @@ function bumpThread($id) {
 function deleteFile($id, $remove_entirely_if_already=true) {
 	global $board, $config;
 	
-	$query = prepare(sprintf("SELECT `thread`,`thumb`,`file` FROM `posts_%s` WHERE `id` = :id LIMIT 1", $board['uri']));
+	$query = prepare(sprintf("SELECT `thread`,`thumb`,`file` FROM ``posts_%s`` WHERE `id` = :id LIMIT 1", $board['uri']));
 	$query->bindValue(':id', $id, PDO::PARAM_INT);
 	$query->execute() or error(db_error($query));
 	if (!$post = $query->fetch(PDO::FETCH_ASSOC))
@@ -848,7 +848,7 @@ function deleteFile($id, $remove_entirely_if_already=true) {
 	if ($post['file'] == 'deleted' && !$post['thread'])
 		return; // Can't delete OP's image completely.
 	
-	$query = prepare(sprintf("UPDATE `posts_%s` SET `thumb` = NULL, `thumbwidth` = NULL, `thumbheight` = NULL, `filewidth` = NULL, `fileheight` = NULL, `filesize` = NULL, `filename` = NULL, `filehash` = NULL, `file` = :file WHERE `id` = :id", $board['uri']));
+	$query = prepare(sprintf("UPDATE ``posts_%s`` SET `thumb` = NULL, `thumbwidth` = NULL, `thumbheight` = NULL, `filewidth` = NULL, `fileheight` = NULL, `filesize` = NULL, `filename` = NULL, `filehash` = NULL, `file` = :file WHERE `id` = :id", $board['uri']));
 	if ($post['file'] == 'deleted' && $remove_entirely_if_already) {
 		// Already deleted; remove file fully
 		$query->bindValue(':file', null, PDO::PARAM_NULL);
@@ -876,7 +876,7 @@ function deleteFile($id, $remove_entirely_if_already=true) {
 function rebuildPost($id) {
 	global $board;
 	
-	$query = prepare(sprintf("SELECT `body_nomarkup`, `thread` FROM `posts_%s` WHERE `id` = :id", $board['uri']));
+	$query = prepare(sprintf("SELECT `body_nomarkup`, `thread` FROM ``posts_%s`` WHERE `id` = :id", $board['uri']));
 	$query->bindValue(':id', $id, PDO::PARAM_INT);
 	$query->execute() or error(db_error($query));
 	
@@ -885,7 +885,7 @@ function rebuildPost($id) {
 	
 	markup($body = &$post['body_nomarkup']);
 	
-	$query = prepare(sprintf("UPDATE `posts_%s` SET `body` = :body WHERE `id` = :id", $board['uri']));
+	$query = prepare(sprintf("UPDATE ``posts_%s`` SET `body` = :body WHERE `id` = :id", $board['uri']));
 	$query->bindValue(':body', $body);
 	$query->bindValue(':id', $id, PDO::PARAM_INT);
 	$query->execute() or error(db_error($query));
@@ -900,7 +900,7 @@ function deletePost($id, $error_if_doesnt_exist=true, $rebuild_after=true) {
 	global $board, $config;
 	
 	// Select post and replies (if thread) in one query
-	$query = prepare(sprintf("SELECT `id`,`thread`,`thumb`,`file` FROM `posts_%s` WHERE `id` = :id OR `thread` = :id", $board['uri']));
+	$query = prepare(sprintf("SELECT `id`,`thread`,`thumb`,`file` FROM ``posts_%s`` WHERE `id` = :id OR `thread` = :id", $board['uri']));
 	$query->bindValue(':id', $id, PDO::PARAM_INT);
 	$query->execute() or error(db_error($query));
 	
@@ -918,7 +918,7 @@ function deletePost($id, $error_if_doesnt_exist=true, $rebuild_after=true) {
 			// Delete thread HTML page
 			file_unlink($board['dir'] . $config['dir']['res'] . sprintf($config['file_page'], $post['id']));
 			
-			$antispam_query = prepare('DELETE FROM `antispam` WHERE `board` = :board AND `thread` = :thread');
+			$antispam_query = prepare('DELETE FROM ``antispam`` WHERE `board` = :board AND `thread` = :thread');
 			$antispam_query->bindValue(':board', $board['uri']);
 			$antispam_query->bindValue(':thread', $post['id']);
 			$antispam_query->execute() or error(db_error($antispam_query));
@@ -939,11 +939,11 @@ function deletePost($id, $error_if_doesnt_exist=true, $rebuild_after=true) {
 		
 	}
 	
-	$query = prepare(sprintf("DELETE FROM `posts_%s` WHERE `id` = :id OR `thread` = :id", $board['uri']));
+	$query = prepare(sprintf("DELETE FROM ``posts_%s`` WHERE `id` = :id OR `thread` = :id", $board['uri']));
 	$query->bindValue(':id', $id, PDO::PARAM_INT);
 	$query->execute() or error(db_error($query));
 	
-	$query = prepare("SELECT `board`, `post` FROM `cites` WHERE `target_board` = :board AND (`target` = " . implode(' OR `target` = ', $ids) . ")");
+	$query = prepare("SELECT `board`, `post` FROM ``cites`` WHERE `target_board` = :board AND (`target` = " . implode(' OR `target` = ', $ids) . ")");
 	$query->bindValue(':board', $board['uri']);
 	$query->execute() or error(db_error($query));
 	while ($cite = $query->fetch(PDO::FETCH_ASSOC)) {
@@ -958,7 +958,7 @@ function deletePost($id, $error_if_doesnt_exist=true, $rebuild_after=true) {
 	if (isset($tmp_board))
 		openBoard($tmp_board);
 	
-	$query = prepare("DELETE FROM `cites` WHERE (`target_board` = :board AND `target` = :id) OR (`board` = :board AND `post` = :id)");
+	$query = prepare("DELETE FROM ``cites`` WHERE (`target_board` = :board AND `target` = :id) OR (`board` = :board AND `post` = :id)");
 	$query->bindValue(':board', $board['uri']);
 	$query->bindValue(':id', $id, PDO::PARAM_INT);
 	$query->execute() or error(db_error($query));
@@ -975,7 +975,7 @@ function clean() {
 	$offset = round($config['max_pages']*$config['threads_per_page']);
 	
 	// I too wish there was an easier way of doing this...
-	$query = prepare(sprintf("SELECT `id` FROM `posts_%s` WHERE `thread` IS NULL ORDER BY `sticky` DESC, `bump` DESC LIMIT :offset, 9001", $board['uri']));
+	$query = prepare(sprintf("SELECT `id` FROM ``posts_%s`` WHERE `thread` IS NULL ORDER BY `sticky` DESC, `bump` DESC LIMIT :offset, 9001", $board['uri']));
 	$query->bindValue(':offset', $offset, PDO::PARAM_INT);
 	
 	$query->execute() or error(db_error($query));
@@ -990,7 +990,7 @@ function index($page, $mod=false) {
 	$body = '';
 	$offset = round($page*$config['threads_per_page']-$config['threads_per_page']);
 	
-	$query = prepare(sprintf("SELECT * FROM `posts_%s` WHERE `thread` IS NULL ORDER BY `sticky` DESC, `bump` DESC LIMIT :offset,:threads_per_page", $board['uri']));
+	$query = prepare(sprintf("SELECT * FROM ``posts_%s`` WHERE `thread` IS NULL ORDER BY `sticky` DESC, `bump` DESC LIMIT :offset,:threads_per_page", $board['uri']));
 	$query->bindValue(':offset', $offset, PDO::PARAM_INT);
 	$query->bindValue(':threads_per_page', $config['threads_per_page'], PDO::PARAM_INT);
 	$query->execute() or error(db_error($query));
@@ -1011,7 +1011,7 @@ function index($page, $mod=false) {
 			$replies = $cached['replies'];
 			$omitted = $cached['omitted'];
 		} else {
-			$posts = prepare(sprintf("SELECT * FROM `posts_%s` WHERE `thread` = :id ORDER BY `id` DESC LIMIT :limit", $board['uri']));
+			$posts = prepare(sprintf("SELECT * FROM ``posts_%s`` WHERE `thread` = :id ORDER BY `id` DESC LIMIT :limit", $board['uri']));
 			$posts->bindValue(':id', $th['id']);
 			$posts->bindValue(':limit', ($th['sticky'] ? $config['threads_preview_sticky'] : $config['threads_preview']), PDO::PARAM_INT);
 			$posts->execute() or error(db_error($posts));
@@ -1115,7 +1115,7 @@ function getPages($mod=false) {
 		$count = $board['thread_count'];
 	} else {
 		// Count threads
-		$query = query(sprintf("SELECT COUNT(*) FROM `posts_%s` WHERE `thread` IS NULL", $board['uri'])) or error(db_error());
+		$query = query(sprintf("SELECT COUNT(*) FROM ``posts_%s`` WHERE `thread` IS NULL", $board['uri'])) or error(db_error());
 		$count = $query->fetchColumn();
 	}
 	$count = floor(($config['threads_per_page'] + $count - 1) / $config['threads_per_page']);
@@ -1151,7 +1151,7 @@ function checkRobot($body) {
 		return true;
 	
 	$body = makerobot($body);
-	$query = prepare("SELECT 1 FROM `robot` WHERE `hash` = :hash LIMIT 1");
+	$query = prepare("SELECT 1 FROM ``robot`` WHERE `hash` = :hash LIMIT 1");
 	$query->bindValue(':hash', $body);
 	$query->execute() or error(db_error($query));
 	
@@ -1160,7 +1160,7 @@ function checkRobot($body) {
 	}
 
 	// Insert new hash
-	$query = prepare("INSERT INTO `robot` VALUES (:hash)");
+	$query = prepare("INSERT INTO ``robot`` VALUES (:hash)");
 	$query->bindValue(':hash', $body);
 	$query->execute() or error(db_error($query));
 	
@@ -1170,7 +1170,7 @@ function checkRobot($body) {
 // Returns an associative array with 'replies' and 'images' keys
 function numPosts($id) {
 	global $board;
-	$query = prepare(sprintf("SELECT COUNT(*) FROM `posts_%s` WHERE `thread` = :thread UNION ALL SELECT COUNT(*) FROM `posts_%s` WHERE `file` IS NOT NULL AND `thread` = :thread", $board['uri'], $board['uri']));
+	$query = prepare(sprintf("SELECT COUNT(*) FROM ``posts_%s`` WHERE `thread` = :thread UNION ALL SELECT COUNT(*) FROM ``posts_%s`` WHERE `file` IS NOT NULL AND `thread` = :thread", $board['uri'], $board['uri']));
 	$query->bindValue(':thread', $id, PDO::PARAM_INT);
 	$query->execute() or error(db_error($query));
 	
@@ -1187,7 +1187,7 @@ function muteTime() {
 		return $time;
 	
 	// Find number of mutes in the past X hours
-	$query = prepare("SELECT COUNT(*) FROM `mutes` WHERE `time` >= :time AND `ip` = :ip");
+	$query = prepare("SELECT COUNT(*) FROM ``mutes`` WHERE `time` >= :time AND `ip` = :ip");
 	$query->bindValue(':time', time()-($config['robot_mute_hour']*3600), PDO::PARAM_INT);
 	$query->bindValue(':ip', $_SERVER['REMOTE_ADDR']);
 	$query->execute() or error(db_error($query));
@@ -1199,7 +1199,7 @@ function muteTime() {
 
 function mute() {
 	// Insert mute
-	$query = prepare("INSERT INTO `mutes` VALUES (:ip, :time)");
+	$query = prepare("INSERT INTO ``mutes`` VALUES (:ip, :time)");
 	$query->bindValue(':time', time(), PDO::PARAM_INT);
 	$query->bindValue(':ip', $_SERVER['REMOTE_ADDR']);
 	$query->execute() or error(db_error($query));
@@ -1220,7 +1220,7 @@ function checkMute() {
 	$mutetime = muteTime();
 	if ($mutetime > 0) {
 		// Find last mute time
-		$query = prepare("SELECT `time` FROM `mutes` WHERE `ip` = :ip ORDER BY `time` DESC LIMIT 1");
+		$query = prepare("SELECT `time` FROM ``mutes`` WHERE `ip` = :ip ORDER BY `time` DESC LIMIT 1");
 		$query->bindValue(':ip', $_SERVER['REMOTE_ADDR']);
 		$query->execute() or error(db_error($query));
 		
@@ -1514,7 +1514,7 @@ function markup(&$body, $track_cites = false) {
 		
 		foreach ($cites as $matches) {
 			$cite = $matches[2][0];
-			$query = prepare(sprintf("SELECT `thread`,`id` FROM `posts_%s` WHERE `id` = :id LIMIT 1", $board['uri']));
+			$query = prepare(sprintf("SELECT `thread`,`id` FROM ``posts_%s`` WHERE `id` = :id LIMIT 1", $board['uri']));
 			$query->bindValue(':id', $cite);
 			$query->execute() or error(db_error($query));
 			
@@ -1562,7 +1562,7 @@ function markup(&$body, $track_cites = false) {
 			// Check if the board exists, and load settings
 			if (openBoard($_board)) {
 				if ($cite) {
-					$query = prepare(sprintf("SELECT `thread`,`id` FROM `posts_%s` WHERE `id` = :id LIMIT 1", $board['uri']));
+					$query = prepare(sprintf("SELECT `thread`,`id` FROM ``posts_%s`` WHERE `id` = :id LIMIT 1", $board['uri']));
 					$query->bindValue(':id', $cite);
 					$query->execute() or error(db_error($query));
 					
@@ -1671,7 +1671,7 @@ function buildThread($id, $return = false, $mod = false) {
 		cache::delete("thread_{$board['uri']}_{$id}");
 	}
 	
-	$query = prepare(sprintf("SELECT * FROM `posts_%s` WHERE (`thread` IS NULL AND `id` = :id) OR `thread` = :id ORDER BY `thread`,`id`", $board['uri']));
+	$query = prepare(sprintf("SELECT * FROM ``posts_%s`` WHERE (`thread` IS NULL AND `id` = :id) OR `thread` = :id ORDER BY `thread`,`id`", $board['uri']));
 	$query->bindValue(':id', $id, PDO::PARAM_INT);
 	$query->execute() or error(db_error($query));
 	
@@ -1806,7 +1806,7 @@ function fraction($numerator, $denominator, $sep) {
 
 function getPostByHash($hash) {
 	global $board;
-	$query = prepare(sprintf("SELECT `id`,`thread` FROM `posts_%s` WHERE `filehash` = :hash", $board['uri']));
+	$query = prepare(sprintf("SELECT `id`,`thread` FROM ``posts_%s`` WHERE `filehash` = :hash", $board['uri']));
 	$query->bindValue(':hash', $hash, PDO::PARAM_STR);
 	$query->execute() or error(db_error($query));
 	
@@ -1819,7 +1819,7 @@ function getPostByHash($hash) {
 
 function getPostByHashInThread($hash, $thread) {
 	global $board;
-	$query = prepare(sprintf("SELECT `id`,`thread` FROM `posts_%s` WHERE `filehash` = :hash AND ( `thread` = :thread OR `id` = :thread )", $board['uri']));
+	$query = prepare(sprintf("SELECT `id`,`thread` FROM ``posts_%s`` WHERE `filehash` = :hash AND ( `thread` = :thread OR `id` = :thread )", $board['uri']));
 	$query->bindValue(':hash', $hash, PDO::PARAM_STR);
 	$query->bindValue(':thread', $thread, PDO::PARAM_INT);
 	$query->execute() or error(db_error($query));
diff --git a/inc/mod/auth.php b/inc/mod/auth.php
index a0986a1f..bfab0f7e 100644
--- a/inc/mod/auth.php
+++ b/inc/mod/auth.php
@@ -42,7 +42,7 @@ function login($username, $password, $makehash=true) {
 		$password = sha1($password);
 	}
 	
-	$query = prepare("SELECT `id`, `type`, `boards`, `password`, `salt` FROM `mods` WHERE `username` = :username");
+	$query = prepare("SELECT `id`, `type`, `boards`, `password`, `salt` FROM ``mods`` WHERE `username` = :username");
 	$query->bindValue(':username', $username);
 	$query->execute() or error(db_error($query));
 	
@@ -83,7 +83,7 @@ function destroyCookies() {
 
 function modLog($action, $_board=null) {
 	global $mod, $board, $config;
-	$query = prepare("INSERT INTO `modlogs` VALUES (:id, :ip, :board, :time, :text)");
+	$query = prepare("INSERT INTO ``modlogs`` VALUES (:id, :ip, :board, :time, :text)");
 	$query->bindValue(':id', $mod['id'], PDO::PARAM_INT);
 	$query->bindValue(':ip', $_SERVER['REMOTE_ADDR']);
 	$query->bindValue(':time', time(), PDO::PARAM_INT);
@@ -112,7 +112,7 @@ if (isset($_COOKIE[$config['cookies']['mod']])) {
 		exit;
 	}
 	
-	$query = prepare("SELECT `id`, `type`, `boards`, `password` FROM `mods` WHERE `username` = :username");
+	$query = prepare("SELECT `id`, `type`, `boards`, `password` FROM ``mods`` WHERE `username` = :username");
 	$query->bindValue(':username', $cookie[0]);
 	$query->execute() or error(db_error($query));
 	$user = $query->fetch(PDO::FETCH_ASSOC);
@@ -143,7 +143,7 @@ function create_pm_header() {
 		return $header;
 	}
 	
-	$query = prepare("SELECT `id` FROM `pms` WHERE `to` = :id AND `unread` = 1");
+	$query = prepare("SELECT `id` FROM ``pms`` WHERE `to` = :id AND `unread` = 1");
 	$query->bindValue(':id', $mod['id'], PDO::PARAM_INT);
 	$query->execute() or error(db_error($query));
 	
diff --git a/inc/mod/ban.php b/inc/mod/ban.php
index cfc2636f..9166223f 100644
--- a/inc/mod/ban.php
+++ b/inc/mod/ban.php
@@ -56,7 +56,7 @@ function parse_time($str) {
 function ban($mask, $reason, $length, $board) {
 	global $mod, $pdo;
 	
-	$query = prepare("INSERT INTO `bans` VALUES (NULL, :ip, :mod, :time, :expires, :reason, :board, 0)");
+	$query = prepare("INSERT INTO ``bans`` VALUES (NULL, :ip, :mod, :time, :expires, :reason, :board, 0)");
 	$query->bindValue(':ip', $mask);
 	$query->bindValue(':mod', $mod['id']);
 	$query->bindValue(':time', time());
@@ -89,12 +89,12 @@ function ban($mask, $reason, $length, $board) {
 }
 
 function unban($id) {
-	$query = prepare("SELECT `ip` FROM `bans` WHERE `id` = :id");
+	$query = prepare("SELECT `ip` FROM ``bans`` WHERE `id` = :id");
 	$query->bindValue(':id', $id);
 	$query->execute() or error(db_error($query));
 	$mask = $query->fetchColumn();
 		
-	$query = prepare("DELETE FROM `bans` WHERE `id` = :id");
+	$query = prepare("DELETE FROM ``bans`` WHERE `id` = :id");
 	$query->bindValue(':id', $id);
 	$query->execute() or error(db_error($query));
 	
diff --git a/inc/mod/pages.php b/inc/mod/pages.php
index 3ff6a9b1..1e0dc7c9 100644
--- a/inc/mod/pages.php
+++ b/inc/mod/pages.php
@@ -82,7 +82,7 @@ function mod_dashboard() {
 	
 	if (hasPermission($config['mod']['noticeboard'])) {
 		if (!$config['cache']['enabled'] || !$args['noticeboard'] = cache::get('noticeboard_preview')) {
-			$query = prepare("SELECT `noticeboard`.*, `username` FROM `noticeboard` LEFT JOIN `mods` ON `mods`.`id` = `mod` ORDER BY `id` DESC LIMIT :limit");
+			$query = prepare("SELECT ``noticeboard``.*, `username` FROM ``noticeboard`` LEFT JOIN ``mods`` ON ``mods``.`id` = `mod` ORDER BY `id` DESC LIMIT :limit");
 			$query->bindValue(':limit', $config['mod']['noticeboard_dashboard'], PDO::PARAM_INT);
 			$query->execute() or error(db_error($query));
 			$args['noticeboard'] = $query->fetchAll(PDO::FETCH_ASSOC);
@@ -93,7 +93,7 @@ function mod_dashboard() {
 	}
 	
 	if (!$config['cache']['enabled'] || ($args['unread_pms'] = cache::get('pm_unreadcount_' . $mod['id'])) == false) {
-		$query = prepare('SELECT COUNT(*) FROM `pms` WHERE `to` = :id AND `unread` = 1');
+		$query = prepare('SELECT COUNT(*) FROM ``pms`` WHERE `to` = :id AND `unread` = 1');
 		$query->bindValue(':id', $mod['id']);
 		$query->execute() or error(db_error($query));
 		$args['unread_pms'] = $query->fetchColumn();
@@ -102,7 +102,7 @@ function mod_dashboard() {
 			cache::set('pm_unreadcount_' . $mod['id'], $args['unread_pms']);
 	}
 	
-	$query = query('SELECT COUNT(*) FROM `reports`') or error(db_error($query));
+	$query = query('SELECT COUNT(*) FROM ``reports``') or error(db_error($query));
 	$args['reports'] = $query->fetchColumn();
 	
 	if ($mod['type'] >= ADMIN && $config['check_updates']) {
@@ -208,6 +208,8 @@ function mod_search($type, $search_query_escaped, $page_no = 1) {
 	// Use asterisk as wildcard instead
 	$query = str_replace('*', '%', $query);
 	
+	$query = str_replace('`', '!`', $query);
+	
 	// Array of phrases to match
 	$match = array();
 	
@@ -271,7 +273,7 @@ function mod_search($type, $search_query_escaped, $page_no = 1) {
 			
 			if (!empty($query))
 				$query .= ' UNION ALL ';
-			$query .= sprintf("SELECT *, '%s' AS `board` FROM `posts_%s` WHERE %s", $board['uri'], $board['uri'], $sql_like);
+			$query .= sprintf("SELECT *, '%s' AS `board` FROM ``posts_%s`` WHERE %s", $board['uri'], $board['uri'], $sql_like);
 		}
 		
 		// You weren't allowed to search any boards
@@ -282,21 +284,21 @@ function mod_search($type, $search_query_escaped, $page_no = 1) {
 	}
 	
 	if ($type == 'IP_notes') {
-		$query = 'SELECT * FROM `ip_notes` LEFT JOIN `mods` ON `mod` = `mods`.`id` WHERE ' . $sql_like . ' ORDER BY `time` DESC';
+		$query = 'SELECT * FROM ``ip_notes`` LEFT JOIN ``mods`` ON `mod` = ``mods``.`id` WHERE ' . $sql_like . ' ORDER BY `time` DESC';
 		$sql_table = 'ip_notes';
 		if (!hasPermission($config['mod']['view_notes']) || !hasPermission($config['mod']['show_ip']))
 			error($config['error']['noaccess']);
 	}
 	
 	if ($type == 'bans') {
-		$query = 'SELECT `bans`.*, `username` FROM `bans` LEFT JOIN `mods` ON `mod` = `mods`.`id` WHERE ' . $sql_like . ' ORDER BY (`expires` IS NOT NULL AND `expires` < UNIX_TIMESTAMP()), `set` DESC';
+		$query = 'SELECT ``bans``.*, `username` FROM ``bans`` LEFT JOIN ``mods`` ON `mod` = ``mods``.`id` WHERE ' . $sql_like . ' ORDER BY (`expires` IS NOT NULL AND `expires` < UNIX_TIMESTAMP()), `set` DESC';
 		$sql_table = 'bans';
 		if (!hasPermission($config['mod']['view_banlist']))
 			error($config['error']['noaccess']);
 	}
 	
 	if ($type == 'log') {
-		$query = 'SELECT `username`, `mod`, `ip`, `board`, `time`, `text` FROM `modlogs` LEFT JOIN `mods` ON `mod` = `mods`.`id` WHERE ' . $sql_like . ' ORDER BY `time` DESC';
+		$query = 'SELECT `username`, `mod`, `ip`, `board`, `time`, `text` FROM ``modlogs`` LEFT JOIN ``mods`` ON `mod` = ``mods``.`id` WHERE ' . $sql_like . ' ORDER BY `time` DESC';
 		$sql_table = 'modlogs';
 		if (!hasPermission($config['mod']['modlog']))
 			error($config['error']['noaccess']);
@@ -353,7 +355,7 @@ function mod_edit_board($boardName) {
 			if (!hasPermission($config['mod']['manageboards'], $board['uri']))
 				error($config['error']['deleteboard']);
 			
-			$query = prepare('DELETE FROM `boards` WHERE `uri` = :uri');
+			$query = prepare('DELETE FROM ``boards`` WHERE `uri` = :uri');
 			$query->bindValue(':uri', $board['uri']);
 			$query->execute() or error(db_error($query));
 			
@@ -363,19 +365,19 @@ function mod_edit_board($boardName) {
 			rrmdir($board['uri'] . '/');
 			
 			// Delete posting table
-			$query = query(sprintf('DROP TABLE IF EXISTS `posts_%s`', $board['uri'])) or error(db_error());
+			$query = query(sprintf('DROP TABLE IF EXISTS ``posts_%s``', $board['uri'])) or error(db_error());
 			
 			// Clear reports
-			$query = prepare('DELETE FROM `reports` WHERE `board` = :id');
+			$query = prepare('DELETE FROM ``reports`` WHERE `board` = :id');
 			$query->bindValue(':id', $board['uri'], PDO::PARAM_INT);
 			$query->execute() or error(db_error($query));
 			
 			// Delete from table
-			$query = prepare('DELETE FROM `boards` WHERE `uri` = :uri');
+			$query = prepare('DELETE FROM ``boards`` WHERE `uri` = :uri');
 			$query->bindValue(':uri', $board['uri'], PDO::PARAM_INT);
 			$query->execute() or error(db_error($query));
 			
-			$query = prepare("SELECT `board`, `post` FROM `cites` WHERE `target_board` = :board");
+			$query = prepare("SELECT `board`, `post` FROM ``cites`` WHERE `target_board` = :board");
 			$query->bindValue(':board', $board['uri']);
 			$query->execute() or error(db_error($query));
 			while ($cite = $query->fetch(PDO::FETCH_ASSOC)) {
@@ -387,28 +389,28 @@ function mod_edit_board($boardName) {
 				}
 			}
 			
-			$query = prepare('DELETE FROM `cites` WHERE `board` = :board OR `target_board` = :board');
+			$query = prepare('DELETE FROM ``cites`` WHERE `board` = :board OR `target_board` = :board');
 			$query->bindValue(':board', $board['uri']);
 			$query->execute() or error(db_error($query));
 			
-			$query = prepare('DELETE FROM `antispam` WHERE `board` = :board');
+			$query = prepare('DELETE FROM ``antispam`` WHERE `board` = :board');
 			$query->bindValue(':board', $board['uri']);
 			$query->execute() or error(db_error($query));
 			
 			// Remove board from users/permissions table
-			$query = query('SELECT `id`,`boards` FROM `mods`') or error(db_error());
+			$query = query('SELECT `id`,`boards` FROM ``mods``') or error(db_error());
 			while ($user = $query->fetch(PDO::FETCH_ASSOC)) {
 				$user_boards = explode(',', $user['boards']);
 				if (in_array($board['uri'], $user_boards)) {
 					unset($user_boards[array_search($board['uri'], $user_boards)]);
-					$_query = prepare('UPDATE `mods` SET `boards` = :boards WHERE `id` = :id');
+					$_query = prepare('UPDATE ``mods`` SET `boards` = :boards WHERE `id` = :id');
 					$_query->bindValue(':boards', implode(',', $user_boards));
 					$_query->bindValue(':id', $user['id']);
 					$_query->execute() or error(db_error($_query));
 				}
 			}
 		} else {
-			$query = prepare('UPDATE `boards` SET `title` = :title, `subtitle` = :subtitle WHERE `uri` = :uri');
+			$query = prepare('UPDATE ``boards`` SET `title` = :title, `subtitle` = :subtitle WHERE `uri` = :uri');
 			$query->bindValue(':uri', $board['uri']);
 			$query->bindValue(':title', $_POST['title']);
 			$query->bindValue(':subtitle', $_POST['subtitle']);
@@ -467,7 +469,7 @@ function mod_new_board() {
 			error(sprintf($config['error']['boardexists'], $board['url']));
 		}
 		
-		$query = prepare('INSERT INTO `boards` VALUES (:uri, :title, :subtitle)');
+		$query = prepare('INSERT INTO ``boards`` VALUES (:uri, :title, :subtitle)');
 		$query->bindValue(':uri', $_POST['uri']);
 		$query->bindValue(':title', $_POST['title']);
 		$query->bindValue(':subtitle', $_POST['subtitle']);
@@ -510,7 +512,7 @@ function mod_noticeboard($page_no = 1) {
 		$_POST['body'] = escape_markup_modifiers($_POST['body']);
 		markup($_POST['body']);
 		
-		$query = prepare('INSERT INTO `noticeboard` VALUES (NULL, :mod, :time, :subject, :body)');
+		$query = prepare('INSERT INTO ``noticeboard`` VALUES (NULL, :mod, :time, :subject, :body)');
 		$query->bindValue(':mod', $mod['id']);
 		$query->bindvalue(':time', time());
 		$query->bindValue(':subject', $_POST['subject']);
@@ -525,7 +527,7 @@ function mod_noticeboard($page_no = 1) {
 		header('Location: ?/noticeboard#' . $pdo->lastInsertId(), true, $config['redirect_http']);
 	}
 	
-	$query = prepare("SELECT `noticeboard`.*, `username` FROM `noticeboard` LEFT JOIN `mods` ON `mods`.`id` = `mod` ORDER BY `id` DESC LIMIT :offset, :limit");
+	$query = prepare("SELECT ``noticeboard``.*, `username` FROM ``noticeboard`` LEFT JOIN ``mods`` ON ``mods``.`id` = `mod` ORDER BY `id` DESC LIMIT :offset, :limit");
 	$query->bindValue(':limit', $config['mod']['noticeboard_page'], PDO::PARAM_INT);
 	$query->bindValue(':offset', ($page_no - 1) * $config['mod']['noticeboard_page'], PDO::PARAM_INT);
 	$query->execute() or error(db_error($query));
@@ -534,7 +536,7 @@ function mod_noticeboard($page_no = 1) {
 	if (empty($noticeboard) && $page_no > 1)
 		error($config['error']['404']);
 	
-	$query = prepare("SELECT COUNT(*) FROM `noticeboard`");
+	$query = prepare("SELECT COUNT(*) FROM ``noticeboard``");
 	$query->execute() or error(db_error($query));
 	$count = $query->fetchColumn();
 	
@@ -547,7 +549,7 @@ function mod_noticeboard_delete($id) {
 	if (!hasPermission($config['mod']['noticeboard_delete']))
 			error($config['error']['noaccess']);
 	
-	$query = prepare('DELETE FROM `noticeboard` WHERE `id` = :id');
+	$query = prepare('DELETE FROM ``noticeboard`` WHERE `id` = :id');
 	$query->bindValue(':id', $id);
 	$query->execute() or error(db_error($query));
 	
@@ -572,7 +574,7 @@ function mod_news($page_no = 1) {
 		$_POST['body'] = escape_markup_modifiers($_POST['body']);
 		markup($_POST['body']);
 		
-		$query = prepare('INSERT INTO `news` VALUES (NULL, :name, :time, :subject, :body)');
+		$query = prepare('INSERT INTO ``news`` VALUES (NULL, :name, :time, :subject, :body)');
 		$query->bindValue(':name', isset($_POST['name']) && hasPermission($config['mod']['news_custom']) ? $_POST['name'] : $mod['username']);
 		$query->bindvalue(':time', time());
 		$query->bindValue(':subject', $_POST['subject']);
@@ -586,7 +588,7 @@ function mod_news($page_no = 1) {
 		header('Location: ?/news#' . $pdo->lastInsertId(), true, $config['redirect_http']);
 	}
 	
-	$query = prepare("SELECT * FROM `news` ORDER BY `id` DESC LIMIT :offset, :limit");
+	$query = prepare("SELECT * FROM ``news`` ORDER BY `id` DESC LIMIT :offset, :limit");
 	$query->bindValue(':limit', $config['mod']['news_page'], PDO::PARAM_INT);
 	$query->bindValue(':offset', ($page_no - 1) * $config['mod']['news_page'], PDO::PARAM_INT);
 	$query->execute() or error(db_error($query));
@@ -595,7 +597,7 @@ function mod_news($page_no = 1) {
 	if (empty($news) && $page_no > 1)
 		error($config['error']['404']);
 	
-	$query = prepare("SELECT COUNT(*) FROM `news`");
+	$query = prepare("SELECT COUNT(*) FROM ``news``");
 	$query->execute() or error(db_error($query));
 	$count = $query->fetchColumn();
 	
@@ -608,7 +610,7 @@ function mod_news_delete($id) {
 	if (!hasPermission($config['mod']['news_delete']))
 			error($config['error']['noaccess']);
 	
-	$query = prepare('DELETE FROM `news` WHERE `id` = :id');
+	$query = prepare('DELETE FROM ``news`` WHERE `id` = :id');
 	$query->bindValue(':id', $id);
 	$query->execute() or error(db_error($query));
 	
@@ -626,7 +628,7 @@ function mod_log($page_no = 1) {
 	if (!hasPermission($config['mod']['modlog']))
 		error($config['error']['noaccess']);
 	
-	$query = prepare("SELECT `username`, `mod`, `ip`, `board`, `time`, `text` FROM `modlogs` LEFT JOIN `mods` ON `mod` = `mods`.`id` ORDER BY `time` DESC LIMIT :offset, :limit");
+	$query = prepare("SELECT `username`, `mod`, `ip`, `board`, `time`, `text` FROM ``modlogs`` LEFT JOIN ``mods`` ON `mod` = ``mods``.`id` ORDER BY `time` DESC LIMIT :offset, :limit");
 	$query->bindValue(':limit', $config['mod']['modlog_page'], PDO::PARAM_INT);
 	$query->bindValue(':offset', ($page_no - 1) * $config['mod']['modlog_page'], PDO::PARAM_INT);
 	$query->execute() or error(db_error($query));
@@ -635,7 +637,7 @@ function mod_log($page_no = 1) {
 	if (empty($logs) && $page_no > 1)
 		error($config['error']['404']);
 	
-	$query = prepare("SELECT COUNT(*) FROM `modlogs`");
+	$query = prepare("SELECT COUNT(*) FROM ``modlogs``");
 	$query->execute() or error(db_error($query));
 	$count = $query->fetchColumn();
 	
@@ -651,7 +653,7 @@ function mod_user_log($username, $page_no = 1) {
 	if (!hasPermission($config['mod']['modlog']))
 		error($config['error']['noaccess']);
 	
-	$query = prepare("SELECT `username`, `mod`, `ip`, `board`, `time`, `text` FROM `modlogs` LEFT JOIN `mods` ON `mod` = `mods`.`id` WHERE `username` = :username ORDER BY `time` DESC LIMIT :offset, :limit");
+	$query = prepare("SELECT `username`, `mod`, `ip`, `board`, `time`, `text` FROM ``modlogs`` LEFT JOIN ``mods`` ON `mod` = ``mods``.`id` WHERE `username` = :username ORDER BY `time` DESC LIMIT :offset, :limit");
 	$query->bindValue(':username', $username);
 	$query->bindValue(':limit', $config['mod']['modlog_page'], PDO::PARAM_INT);
 	$query->bindValue(':offset', ($page_no - 1) * $config['mod']['modlog_page'], PDO::PARAM_INT);
@@ -661,7 +663,7 @@ function mod_user_log($username, $page_no = 1) {
 	if (empty($logs) && $page_no > 1)
 		error($config['error']['404']);
 	
-	$query = prepare("SELECT COUNT(*) FROM `modlogs` LEFT JOIN `mods` ON `mod` = `mods`.`id` WHERE `username` = :username");
+	$query = prepare("SELECT COUNT(*) FROM ``modlogs`` LEFT JOIN ``mods`` ON `mod` = ``mods``.`id` WHERE `username` = :username");
 	$query->bindValue(':username', $username);
 	$query->execute() or error(db_error($query));
 	$count = $query->fetchColumn();
@@ -707,7 +709,7 @@ function mod_ip_remove_note($ip, $id) {
 	if (filter_var($ip, FILTER_VALIDATE_IP) === false)
 		error("Invalid IP address.");
 	
-	$query = prepare('DELETE FROM `ip_notes` WHERE `ip` = :ip AND `id` = :id');
+	$query = prepare('DELETE FROM ``ip_notes`` WHERE `ip` = :ip AND `id` = :id');
 	$query->bindValue(':ip', $ip);
 	$query->bindValue(':id', $id);
 	$query->execute() or error(db_error($query));
@@ -741,7 +743,7 @@ function mod_page_ip($ip) {
 		
 		$_POST['note'] = escape_markup_modifiers($_POST['note']);
 		markup($_POST['note']);
-		$query = prepare('INSERT INTO `ip_notes` VALUES (NULL, :ip, :mod, :time, :body)');
+		$query = prepare('INSERT INTO ``ip_notes`` VALUES (NULL, :ip, :mod, :time, :body)');
 		$query->bindValue(':ip', $ip);
 		$query->bindValue(':mod', $mod['id']);
 		$query->bindValue(':time', time());
@@ -766,7 +768,7 @@ function mod_page_ip($ip) {
 		openBoard($board['uri']);
 		if (!hasPermission($config['mod']['show_ip'], $board['uri']))
 			continue;
-		$query = prepare(sprintf('SELECT * FROM `posts_%s` WHERE `ip` = :ip ORDER BY `sticky` DESC, `id` DESC LIMIT :limit', $board['uri']));
+		$query = prepare(sprintf('SELECT * FROM ``posts_%s`` WHERE `ip` = :ip ORDER BY `sticky` DESC, `id` DESC LIMIT :limit', $board['uri']));
 		$query->bindValue(':ip', $ip);
 		$query->bindValue(':limit', $config['mod']['ip_recentposts'], PDO::PARAM_INT);
 		$query->execute() or error(db_error($query));
@@ -798,21 +800,21 @@ function mod_page_ip($ip) {
 	$args['token'] = make_secure_link_token('ban');
 	
 	if (hasPermission($config['mod']['view_ban'])) {
-		$query = prepare("SELECT `bans`.*, `username` FROM `bans` LEFT JOIN `mods` ON `mod` = `mods`.`id` WHERE `ip` = :ip");
+		$query = prepare("SELECT ``bans``.*, `username` FROM ``bans`` LEFT JOIN ``mods`` ON `mod` = ``mods``.`id` WHERE `ip` = :ip");
 		$query->bindValue(':ip', $ip);
 		$query->execute() or error(db_error($query));
 		$args['bans'] = $query->fetchAll(PDO::FETCH_ASSOC);
 	}
 	
 	if (hasPermission($config['mod']['view_notes'])) {
-		$query = prepare("SELECT `ip_notes`.*, `username` FROM `ip_notes` LEFT JOIN `mods` ON `mod` = `mods`.`id` WHERE `ip` = :ip");
+		$query = prepare("SELECT ``ip_notes``.*, `username` FROM ``ip_notes`` LEFT JOIN ``mods`` ON `mod` = ``mods``.`id` WHERE `ip` = :ip");
 		$query->bindValue(':ip', $ip);
 		$query->execute() or error(db_error($query));
 		$args['notes'] = $query->fetchAll(PDO::FETCH_ASSOC);
 	}
 	
 	if (hasPermission($config['mod']['modlog_ip'])) {
-		$query = prepare("SELECT `username`, `mod`, `ip`, `board`, `time`, `text` FROM `modlogs` LEFT JOIN `mods` ON `mod` = `mods`.`id` WHERE `text` LIKE :search ORDER BY `time` DESC LIMIT 20");
+		$query = prepare("SELECT `username`, `mod`, `ip`, `board`, `time`, `text` FROM ``modlogs`` LEFT JOIN ``mods`` ON `mod` = ``mods``.`id` WHERE `text` LIKE :search ORDER BY `time` DESC LIMIT 20");
 		$query->bindValue(':search', '%' . $ip . '%');
 		$query->execute() or error(db_error($query));
 		$args['logs'] = $query->fetchAll(PDO::FETCH_ASSOC);
@@ -865,7 +867,7 @@ function mod_bans($page_no = 1) {
 		if (isset($config['mod']['unban_limit'])){
 		if (count($unban) <= $config['mod']['unban_limit'] || $config['mod']['unban_limit'] == -1){ 
 		if (!empty($unban)) {
-			query('DELETE FROM `bans` WHERE `id` = ' . implode(' OR `id` = ', $unban)) or error(db_error());
+			query('DELETE FROM ``bans`` WHERE `id` = ' . implode(' OR `id` = ', $unban)) or error(db_error());
 		
 			foreach ($unban as $id) {
 				modLog("Removed ban #{$id}");
@@ -878,7 +880,7 @@ function mod_bans($page_no = 1) {
 	} else {
 		
 			if (!empty($unban)) {
-			query('DELETE FROM `bans` WHERE `id` = ' . implode(' OR `id` = ', $unban)) or error(db_error());
+			query('DELETE FROM ``bans`` WHERE `id` = ' . implode(' OR `id` = ', $unban)) or error(db_error());
 		
 			foreach ($unban as $id) {
 				modLog("Removed ban #{$id}");
@@ -890,10 +892,10 @@ function mod_bans($page_no = 1) {
 	}
 	
 	if ($config['mod']['view_banexpired']) {
-		$query = prepare("SELECT `bans`.*, `username` FROM `bans` LEFT JOIN `mods` ON `mod` = `mods`.`id` ORDER BY (`expires` IS NOT NULL AND `expires` < :time), `set` DESC LIMIT :offset, :limit");
+		$query = prepare("SELECT ``bans``.*, `username` FROM ``bans`` LEFT JOIN ``mods`` ON `mod` = ``mods``.`id` ORDER BY (`expires` IS NOT NULL AND `expires` < :time), `set` DESC LIMIT :offset, :limit");
 	} else {
 		// Filter out expired bans
-		$query = prepare("SELECT `bans`.*, `username` FROM `bans` INNER JOIN `mods` ON `mod` = `mods`.`id` WHERE `expires` = 0 OR `expires` > :time ORDER BY `set` DESC LIMIT :offset, :limit");
+		$query = prepare("SELECT ``bans``.*, `username` FROM ``bans`` INNER JOIN ``mods`` ON `mod` = ``mods``.`id` WHERE `expires` = 0 OR `expires` > :time ORDER BY `set` DESC LIMIT :offset, :limit");
 	}
 	$query->bindValue(':time', time(), PDO::PARAM_INT);
 	$query->bindValue(':limit', $config['mod']['banlist_page'], PDO::PARAM_INT);
@@ -904,7 +906,7 @@ function mod_bans($page_no = 1) {
 	if (empty($bans) && $page_no > 1)
 		error($config['error']['404']);
 	
-	$query = prepare("SELECT COUNT(*) FROM `bans`");
+	$query = prepare("SELECT COUNT(*) FROM ``bans``");
 	$query->execute() or error(db_error($query));
 	$count = $query->fetchColumn();
 	
@@ -926,7 +928,7 @@ function mod_lock($board, $unlock, $post) {
 	if (!hasPermission($config['mod']['lock'], $board))
 		error($config['error']['noaccess']);
 	
-	$query = prepare(sprintf('UPDATE `posts_%s` SET `locked` = :locked WHERE `id` = :id AND `thread` IS NULL', $board));
+	$query = prepare(sprintf('UPDATE ``posts_%s`` SET `locked` = :locked WHERE `id` = :id AND `thread` IS NULL', $board));
 	$query->bindValue(':id', $post);
 	$query->bindValue(':locked', $unlock ? 0 : 1);
 	$query->execute() or error(db_error($query));
@@ -937,7 +939,7 @@ function mod_lock($board, $unlock, $post) {
 	}
 	
 	if ($config['mod']['dismiss_reports_on_lock']) {
-		$query = prepare('DELETE FROM `reports` WHERE `board` = :board AND `post` = :id');
+		$query = prepare('DELETE FROM ``reports`` WHERE `board` = :board AND `post` = :id');
 		$query->bindValue(':board', $board);
 		$query->bindValue(':id', $post);
 		$query->execute() or error(db_error($query));
@@ -960,7 +962,7 @@ function mod_sticky($board, $unsticky, $post) {
 	if (!hasPermission($config['mod']['sticky'], $board))
 		error($config['error']['noaccess']);
 	
-	$query = prepare(sprintf('UPDATE `posts_%s` SET `sticky` = :sticky WHERE `id` = :id AND `thread` IS NULL', $board));
+	$query = prepare(sprintf('UPDATE ``posts_%s`` SET `sticky` = :sticky WHERE `id` = :id AND `thread` IS NULL', $board));
 	$query->bindValue(':id', $post);
 	$query->bindValue(':sticky', $unsticky ? 0 : 1);
 	$query->execute() or error(db_error($query));
@@ -982,7 +984,7 @@ function mod_bumplock($board, $unbumplock, $post) {
 	if (!hasPermission($config['mod']['bumplock'], $board))
 		error($config['error']['noaccess']);
 	
-	$query = prepare(sprintf('UPDATE `posts_%s` SET `sage` = :bumplock WHERE `id` = :id AND `thread` IS NULL', $board));
+	$query = prepare(sprintf('UPDATE ``posts_%s`` SET `sage` = :bumplock WHERE `id` = :id AND `thread` IS NULL', $board));
 	$query->bindValue(':id', $post);
 	$query->bindValue(':bumplock', $unbumplock ? 0 : 1);
 	$query->execute() or error(db_error($query));
@@ -1004,7 +1006,7 @@ function mod_move($originBoard, $postID) {
 	if (!hasPermission($config['mod']['move'], $originBoard))
 		error($config['error']['noaccess']);
 	
-	$query = prepare(sprintf('SELECT * FROM `posts_%s` WHERE `id` = :id AND `thread` IS NULL', $originBoard));
+	$query = prepare(sprintf('SELECT * FROM ``posts_%s`` WHERE `id` = :id AND `thread` IS NULL', $originBoard));
 	$query->bindValue(':id', $postID);
 	$query->execute() or error(db_error($query));
 	if (!$post = $query->fetch(PDO::FETCH_ASSOC))
@@ -1052,7 +1054,7 @@ function mod_move($originBoard, $postID) {
 		// go back to the original board to fetch replies
 		openBoard($originBoard);
 		
-		$query = prepare(sprintf('SELECT * FROM `posts_%s` WHERE `thread` = :id ORDER BY `id`', $originBoard));
+		$query = prepare(sprintf('SELECT * FROM ``posts_%s`` WHERE `thread` = :id ORDER BY `id`', $originBoard));
 		$query->bindValue(':id', $postID, PDO::PARAM_INT);
 		$query->execute() or error(db_error($query));
 		
@@ -1081,7 +1083,7 @@ function mod_move($originBoard, $postID) {
 		openBoard($targetBoard);
 		
 		foreach ($replies as &$post) {
-			$query = prepare('SELECT `target` FROM `cites` WHERE `target_board` = :board AND `board` = :board AND `post` = :post');
+			$query = prepare('SELECT `target` FROM ``cites`` WHERE `target_board` = :board AND `board` = :board AND `post` = :post');
 			$query->bindValue(':board', $originBoard);
 			$query->bindValue(':post', $post['id'], PDO::PARAM_INT);
 			$query->execute() or error(db_error($qurey));
@@ -1113,7 +1115,7 @@ function mod_move($originBoard, $postID) {
 			}
 			
 			foreach ($post['tracked_cites'] as $cite) {
-				$query = prepare('INSERT INTO `cites` VALUES (:board, :post, :target_board, :target)');
+				$query = prepare('INSERT INTO ``cites`` VALUES (:board, :post, :target_board, :target)');
 				$query->bindValue(':board', $board['uri']);
 				$query->bindValue(':post', $newPostID, PDO::PARAM_INT);
 				$query->bindValue(':target_board',$cite[0]);
@@ -1138,7 +1140,7 @@ function mod_move($originBoard, $postID) {
 		
 		if ($shadow) {
 			// lock old thread
-			$query = prepare(sprintf('UPDATE `posts_%s` SET `locked` = 1 WHERE `id` = :id', $originBoard));
+			$query = prepare(sprintf('UPDATE ``posts_%s`` SET `locked` = 1 WHERE `id` = :id', $originBoard));
 			$query->bindValue(':id', $postID, PDO::PARAM_INT);
 			$query->execute() or error(db_error($query));
 			
@@ -1197,7 +1199,7 @@ function mod_ban_post($board, $delete, $post, $token = false) {
 	
 	$security_token = make_secure_link_token($board . '/ban/' . $post);
 	
-	$query = prepare(sprintf('SELECT `ip`, `thread` FROM `posts_%s` WHERE `id` = :id', $board));
+	$query = prepare(sprintf('SELECT `ip`, `thread` FROM ``posts_%s`` WHERE `id` = :id', $board));
 	$query->bindValue(':id', $post);
 	$query->execute() or error(db_error($query));
 	if (!$_post = $query->fetch(PDO::FETCH_ASSOC))
@@ -1220,7 +1222,7 @@ function mod_ban_post($board, $delete, $post, $token = false) {
 			$_POST['message'] = preg_replace('/[\r\n]/', '', $_POST['message']);
 			$_POST['message'] = str_replace('%length%', $length_english, $_POST['message']);
 			$_POST['message'] = str_replace('%LENGTH%', strtoupper($length_english), $_POST['message']);
-			$query = prepare(sprintf('UPDATE `posts_%s` SET `body_nomarkup` = CONCAT(`body_nomarkup`, :body_nomarkup) WHERE `id` = :id', $board));
+			$query = prepare(sprintf('UPDATE ``posts_%s`` SET `body_nomarkup` = CONCAT(`body_nomarkup`, :body_nomarkup) WHERE `id` = :id', $board));
 			$query->bindValue(':id', $post);
 			$query->bindValue(':body_nomarkup', sprintf("\n<tinyboard ban message>%s</tinyboard>", utf8tohtml($_POST['message'])));
 			$query->execute() or error(db_error($query));
@@ -1267,7 +1269,7 @@ function mod_edit_post($board, $edit_raw_html, $postID) {
 
 	$security_token = make_secure_link_token($board . '/edit' . ($edit_raw_html ? '_raw' : '') . '/' . $postID);
 	
-	$query = prepare(sprintf('SELECT * FROM `posts_%s` WHERE `id` = :id', $board));
+	$query = prepare(sprintf('SELECT * FROM ``posts_%s`` WHERE `id` = :id', $board));
 	$query->bindValue(':id', $postID);
 	$query->execute() or error(db_error($query));
 
@@ -1276,9 +1278,9 @@ function mod_edit_post($board, $edit_raw_html, $postID) {
 	
 	if (isset($_POST['name'], $_POST['email'], $_POST['subject'], $_POST['body'])) {
 		if ($edit_raw_html)
-			$query = prepare(sprintf('UPDATE `posts_%s` SET `name` = :name, `email` = :email, `subject` = :subject, `body` = :body, `body_nomarkup` = :body_nomarkup WHERE `id` = :id', $board));
+			$query = prepare(sprintf('UPDATE ``posts_%s`` SET `name` = :name, `email` = :email, `subject` = :subject, `body` = :body, `body_nomarkup` = :body_nomarkup WHERE `id` = :id', $board));
 		else
-			$query = prepare(sprintf('UPDATE `posts_%s` SET `name` = :name, `email` = :email, `subject` = :subject, `body_nomarkup` = :body WHERE `id` = :id', $board));
+			$query = prepare(sprintf('UPDATE ``posts_%s`` SET `name` = :name, `email` = :email, `subject` = :subject, `body_nomarkup` = :body WHERE `id` = :id', $board));
 		$query->bindValue(':id', $postID);
 		$query->bindValue('name', $_POST['name']);
 		$query->bindValue(':email', $_POST['email']);
@@ -1369,7 +1371,7 @@ function mod_deletebyip($boardName, $post, $global = false) {
 		error($config['error']['noaccess']);
 	
 	// Find IP address
-	$query = prepare(sprintf('SELECT `ip` FROM `posts_%s` WHERE `id` = :id', $boardName));
+	$query = prepare(sprintf('SELECT `ip` FROM ``posts_%s`` WHERE `id` = :id', $boardName));
 	$query->bindValue(':id', $post);
 	$query->execute() or error(db_error($query));
 	if (!$ip = $query->fetchColumn())
@@ -1379,7 +1381,7 @@ function mod_deletebyip($boardName, $post, $global = false) {
 	
 	$query = '';
 	foreach ($boards as $_board) {
-		$query .= sprintf("SELECT `thread`, `id`, '%s' AS `board` FROM `posts_%s` WHERE `ip` = :ip UNION ALL ", $_board['uri'], $_board['uri']);
+		$query .= sprintf("SELECT `thread`, `id`, '%s' AS `board` FROM ``posts_%s`` WHERE `ip` = :ip UNION ALL ", $_board['uri'], $_board['uri']);
 	}
 	$query = preg_replace('/UNION ALL $/', '', $query);
 	
@@ -1431,7 +1433,7 @@ function mod_user($uid) {
 	if (!hasPermission($config['mod']['editusers']) && !(hasPermission($config['mod']['change_password']) && $uid == $mod['id']))
 		error($config['error']['noaccess']);
 	
-	$query = prepare('SELECT * FROM `mods` WHERE `id` = :id');
+	$query = prepare('SELECT * FROM ``mods`` WHERE `id` = :id');
 	$query->bindValue(':id', $uid);
 	$query->execute() or error(db_error($query));
 	if (!$user = $query->fetch(PDO::FETCH_ASSOC))
@@ -1457,7 +1459,7 @@ function mod_user($uid) {
 			if (!hasPermission($config['mod']['deleteusers']))
 				error($config['error']['noaccess']);
 			
-			$query = prepare('DELETE FROM `mods` WHERE `id` = :id');
+			$query = prepare('DELETE FROM ``mods`` WHERE `id` = :id');
 			$query->bindValue(':id', $uid);
 			$query->execute() or error(db_error($query));
 			
@@ -1471,7 +1473,7 @@ function mod_user($uid) {
 		if ($_POST['username'] == '')
 			error(sprintf($config['error']['required'], 'username'));
 		
-		$query = prepare('UPDATE `mods` SET `username` = :username, `boards` = :boards WHERE `id` = :id');
+		$query = prepare('UPDATE ``mods`` SET `username` = :username, `boards` = :boards WHERE `id` = :id');
 		$query->bindValue(':id', $uid);
 		$query->bindValue(':username', $_POST['username']);
 		$query->bindValue(':boards', implode(',', $boards));
@@ -1486,7 +1488,7 @@ function mod_user($uid) {
 			$salt = generate_salt();
 			$password = hash('sha256', $salt . sha1($_POST['password']));
 			
-			$query = prepare('UPDATE `mods` SET `password` = :password, `salt` = :salt WHERE `id` = :id');
+			$query = prepare('UPDATE ``mods`` SET `password` = :password, `salt` = :salt WHERE `id` = :id');
 			$query->bindValue(':id', $uid);
 			$query->bindValue(':password', $password);
 			$query->bindValue(':salt', $salt);
@@ -1513,7 +1515,7 @@ function mod_user($uid) {
 			$salt = generate_salt();
 			$password = hash('sha256', $salt . sha1($_POST['password']));
 
-			$query = prepare('UPDATE `mods` SET `password` = :password, `salt` = :salt WHERE `id` = :id');
+			$query = prepare('UPDATE ``mods`` SET `password` = :password, `salt` = :salt WHERE `id` = :id');
 			$query->bindValue(':id', $uid);
 			$query->bindValue(':password', $password);
 			$query->bindValue(':salt', $salt);
@@ -1534,7 +1536,7 @@ function mod_user($uid) {
 	}
 	
 	if (hasPermission($config['mod']['modlog'])) {
-		$query = prepare('SELECT * FROM `modlogs` WHERE `mod` = :id ORDER BY `time` DESC LIMIT 5');
+		$query = prepare('SELECT * FROM ``modlogs`` WHERE `mod` = :id ORDER BY `time` DESC LIMIT 5');
 		$query->bindValue(':id', $uid);
 		$query->execute() or error(db_error($query));
 		$log = $query->fetchAll(PDO::FETCH_ASSOC);
@@ -1581,7 +1583,7 @@ function mod_user_new() {
 		$salt = generate_salt();
 		$password = hash('sha256', $salt . sha1($_POST['password']));
 		
-		$query = prepare('INSERT INTO `mods` VALUES (NULL, :username, :password, :salt, :type, :boards)');
+		$query = prepare('INSERT INTO ``mods`` VALUES (NULL, :username, :password, :salt, :type, :boards)');
 		$query->bindValue(':username', $_POST['username']);
 		$query->bindValue(':password', $password);
 		$query->bindValue(':salt', $salt);
@@ -1607,7 +1609,7 @@ function mod_users() {
 	if (!hasPermission($config['mod']['manageusers']))
 		error($config['error']['noaccess']);
 	
-	$query = query("SELECT *, (SELECT `time` FROM `modlogs` WHERE `mod` = `id` ORDER BY `time` DESC LIMIT 1) AS `last`, (SELECT `text` FROM `modlogs` WHERE `mod` = `id` ORDER BY `time` DESC LIMIT 1) AS `action` FROM `mods` ORDER BY `type` DESC,`id`") or error(db_error());
+	$query = query("SELECT *, (SELECT `time` FROM ``modlogs`` WHERE `mod` = `id` ORDER BY `time` DESC LIMIT 1) AS `last`, (SELECT `text` FROM ``modlogs`` WHERE `mod` = `id` ORDER BY `time` DESC LIMIT 1) AS `action` FROM ``mods`` ORDER BY `type` DESC,`id`") or error(db_error());
 	$users = $query->fetchAll(PDO::FETCH_ASSOC);
 	
 	mod_page(sprintf('%s (%d)', _('Manage users'), count($users)), 'mod/users.html', array('users' => $users));
@@ -1619,7 +1621,7 @@ function mod_user_promote($uid, $action) {
 	if (!hasPermission($config['mod']['promoteusers']))
 		error($config['error']['noaccess']);
 	
-	$query = prepare("UPDATE `mods` SET `type` = `type` " . ($action == 'promote' ? "+1 WHERE `type` < " . (int)ADMIN : "-1 WHERE `type` > " . (int)JANITOR) . " AND `id` = :id");
+	$query = prepare("UPDATE ``mods`` SET `type` = `type` " . ($action == 'promote' ? "+1 WHERE `type` < " . (int)ADMIN : "-1 WHERE `type` > " . (int)JANITOR) . " AND `id` = :id");
 	$query->bindValue(':id', $uid);
 	$query->execute() or error(db_error($query));
 	
@@ -1634,7 +1636,7 @@ function mod_pm($id, $reply = false) {
 	if ($reply && !hasPermission($config['mod']['create_pm']))
 		error($config['error']['noaccess']);
 	
-	$query = prepare("SELECT `mods`.`username`, `mods_to`.`username` AS `to_username`, `pms`.* FROM `pms` LEFT JOIN `mods` ON `mods`.`id` = `sender` LEFT JOIN `mods` AS `mods_to` ON `mods_to`.`id` = `to` WHERE `pms`.`id` = :id");
+	$query = prepare("SELECT ``mods``.`username`, `mods_to`.`username` AS `to_username`, ``pms``.* FROM ``pms`` LEFT JOIN ``mods`` ON ``mods``.`id` = `sender` LEFT JOIN ``mods`` AS `mods_to` ON `mods_to`.`id` = `to` WHERE ``pms``.`id` = :id");
 	$query->bindValue(':id', $id);
 	$query->execute() or error(db_error($query));
 	
@@ -1642,7 +1644,7 @@ function mod_pm($id, $reply = false) {
 		error($config['error']['404']);
 	
 	if (isset($_POST['delete'])) {
-		$query = prepare("DELETE FROM `pms` WHERE `id` = :id");
+		$query = prepare("DELETE FROM ``pms`` WHERE `id` = :id");
 		$query->bindValue(':id', $id);
 		$query->execute() or error(db_error($query));
 		
@@ -1656,7 +1658,7 @@ function mod_pm($id, $reply = false) {
 	}
 	
 	if ($pm['unread'] && $pm['to'] == $mod['id']) {
-		$query = prepare("UPDATE `pms` SET `unread` = 0 WHERE `id` = :id");
+		$query = prepare("UPDATE ``pms`` SET `unread` = 0 WHERE `id` = :id");
 		$query->bindValue(':id', $id);
 		$query->execute() or error(db_error($query));
 		
@@ -1683,12 +1685,12 @@ function mod_pm($id, $reply = false) {
 function mod_inbox() {
 	global $config, $mod;
 	
-	$query = prepare('SELECT `unread`,`pms`.`id`, `time`, `sender`, `to`, `message`, `username` FROM `pms` LEFT JOIN `mods` ON `mods`.`id` = `sender` WHERE `to` = :mod ORDER BY `unread` DESC, `time` DESC');
+	$query = prepare('SELECT `unread`,``pms``.`id`, `time`, `sender`, `to`, `message`, `username` FROM ``pms`` LEFT JOIN ``mods`` ON ``mods``.`id` = `sender` WHERE `to` = :mod ORDER BY `unread` DESC, `time` DESC');
 	$query->bindValue(':mod', $mod['id']);
 	$query->execute() or error(db_error($query));
 	$messages = $query->fetchAll(PDO::FETCH_ASSOC);
 	
-	$query = prepare('SELECT COUNT(*) FROM `pms` WHERE `to` = :mod AND `unread` = 1');
+	$query = prepare('SELECT COUNT(*) FROM ``pms`` WHERE `to` = :mod AND `unread` = 1');
 	$query->bindValue(':mod', $mod['id']);
 	$query->execute() or error(db_error($query));
 	$unread = $query->fetchColumn();
@@ -1710,12 +1712,12 @@ function mod_new_pm($username) {
 	if (!hasPermission($config['mod']['create_pm']))
 		error($config['error']['noaccess']);
 	
-	$query = prepare("SELECT `id` FROM `mods` WHERE `username` = :username");
+	$query = prepare("SELECT `id` FROM ``mods`` WHERE `username` = :username");
 	$query->bindValue(':username', $username);
 	$query->execute() or error(db_error($query));
 	if (!$id = $query->fetchColumn()) {
 		// Old style ?/PM: by user ID
-		$query = prepare("SELECT `username` FROM `mods` WHERE `id` = :username");
+		$query = prepare("SELECT `username` FROM ``mods`` WHERE `id` = :username");
 		$query->bindValue(':username', $username);
 		$query->execute() or error(db_error($query));
 		if ($username = $query->fetchColumn())
@@ -1728,7 +1730,7 @@ function mod_new_pm($username) {
 		$_POST['message'] = escape_markup_modifiers($_POST['message']);
 		markup($_POST['message']);
 		
-		$query = prepare("INSERT INTO `pms` VALUES (NULL, :me, :id, :message, :time, 1)");
+		$query = prepare("INSERT INTO ``pms`` VALUES (NULL, :me, :id, :message, :time, 1)");
 		$query->bindValue(':me', $mod['id']);
 		$query->bindValue(':id', $id);
 		$query->bindValue(':message', $_POST['message']);
@@ -1801,7 +1803,7 @@ function mod_rebuild() {
 			}
 			
 			if (isset($_POST['rebuild_thread'])) {
-				$query = query(sprintf("SELECT `id` FROM `posts_%s` WHERE `thread` IS NULL", $board['uri'])) or error(db_error());
+				$query = query(sprintf("SELECT `id` FROM ``posts_%s`` WHERE `thread` IS NULL", $board['uri'])) or error(db_error());
 				while ($post = $query->fetch(PDO::FETCH_ASSOC)) {
 					$log[] = '<strong>' . sprintf($config['board_abbreviation'], $board['uri']) . '</strong>: Rebuilding thread #' . $post['id'];
 					buildThread($post['id']);
@@ -1822,7 +1824,7 @@ function mod_reports() {
 	if (!hasPermission($config['mod']['reports']))
 		error($config['error']['noaccess']);
 	
-	$query = prepare("SELECT * FROM `reports` ORDER BY `time` DESC LIMIT :limit");
+	$query = prepare("SELECT * FROM ``reports`` ORDER BY `time` DESC LIMIT :limit");
 	$query->bindValue(':limit', $config['mod']['recent_reports'], PDO::PARAM_INT);
 	$query->execute() or error(db_error($query));
 	$reports = $query->fetchAll(PDO::FETCH_ASSOC);
@@ -1838,7 +1840,7 @@ function mod_reports() {
 	foreach ($report_queries as $board => $posts) {
 		$report_posts[$board] = array();
 		
-		$query = query(sprintf('SELECT * FROM `posts_%s` WHERE `id` = ' . implode(' OR `id` = ', $posts), $board)) or error(db_error());
+		$query = query(sprintf('SELECT * FROM ``posts_%s`` WHERE `id` = ' . implode(' OR `id` = ', $posts), $board)) or error(db_error());
 		while ($post = $query->fetch(PDO::FETCH_ASSOC)) {
 			$report_posts[$board][$post['id']] = $post;
 		}
@@ -1849,7 +1851,7 @@ function mod_reports() {
 	foreach ($reports as $report) {
 		if (!isset($report_posts[$report['board']][$report['post']])) {
 			// // Invalid report (post has since been deleted)
-			$query = prepare("DELETE FROM `reports` WHERE `post` = :id AND `board` = :board");
+			$query = prepare("DELETE FROM ``reports`` WHERE `post` = :id AND `board` = :board");
 			$query->bindValue(':id', $report['post'], PDO::PARAM_INT);
 			$query->bindValue(':board', $report['board']);
 			$query->execute() or error(db_error($query));
@@ -1905,7 +1907,7 @@ function mod_reports() {
 function mod_report_dismiss($id, $all = false) {
 	global $config;
 	
-	$query = prepare("SELECT `post`, `board`, `ip` FROM `reports` WHERE `id` = :id");
+	$query = prepare("SELECT `post`, `board`, `ip` FROM ``reports`` WHERE `id` = :id");
 	$query->bindValue(':id', $id);
 	$query->execute() or error(db_error($query));
 	if ($report = $query->fetch(PDO::FETCH_ASSOC)) {
@@ -1922,10 +1924,10 @@ function mod_report_dismiss($id, $all = false) {
 		error($config['error']['noaccess']);
 	
 	if ($all) {
-		$query = prepare("DELETE FROM `reports` WHERE `ip` = :ip");
+		$query = prepare("DELETE FROM ``reports`` WHERE `ip` = :ip");
 		$query->bindValue(':ip', $ip);
 	} else {
-		$query = prepare("DELETE FROM `reports` WHERE `id` = :id");
+		$query = prepare("DELETE FROM ``reports`` WHERE `id` = :id");
 		$query->bindValue(':id', $id);
 	}
 	$query->execute() or error(db_error($query));
@@ -2035,7 +2037,7 @@ function mod_themes_list() {
 	if (!$dir = opendir($config['dir']['themes']))
 		error(_('Cannot open themes directory; check permissions.'));
 
-	$query = query('SELECT `theme` FROM `theme_settings` WHERE `name` IS NULL AND `value` IS NULL') or error(db_error());
+	$query = query('SELECT `theme` FROM ``theme_settings`` WHERE `name` IS NULL AND `value` IS NULL') or error(db_error());
 	$themes_in_use = $query->fetchAll(PDO::FETCH_COLUMN);
 
 	// Scan directory for themes
@@ -2071,19 +2073,19 @@ function mod_theme_configure($theme_name) {
 		}
 		
 		// Clear previous settings
-		$query = prepare("DELETE FROM `theme_settings` WHERE `theme` = :theme");
+		$query = prepare("DELETE FROM ``theme_settings`` WHERE `theme` = :theme");
 		$query->bindValue(':theme', $theme_name);
 		$query->execute() or error(db_error($query));
 		
 		foreach ($theme['config'] as &$conf) {
-			$query = prepare("INSERT INTO `theme_settings` VALUES(:theme, :name, :value)");
+			$query = prepare("INSERT INTO ``theme_settings`` VALUES(:theme, :name, :value)");
 			$query->bindValue(':theme', $theme_name);
 			$query->bindValue(':name', $conf['name']);
 			$query->bindValue(':value', $_POST[$conf['name']]);
 			$query->execute() or error(db_error($query));
 		}
 		
-		$query = prepare("INSERT INTO `theme_settings` VALUES(:theme, NULL, NULL)");
+		$query = prepare("INSERT INTO ``theme_settings`` VALUES(:theme, NULL, NULL)");
 		$query->bindValue(':theme', $theme_name);
 		$query->execute() or error(db_error($query));
 		
@@ -2101,7 +2103,7 @@ function mod_theme_configure($theme_name) {
 		
 		if (!$result) {
 			// Install failed
-			$query = prepare("DELETE FROM `theme_settings` WHERE `theme` = :theme");
+			$query = prepare("DELETE FROM ``theme_settings`` WHERE `theme` = :theme");
 			$query->bindValue(':theme', $theme_name);
 			$query->execute() or error(db_error($query));
 		}
@@ -2133,7 +2135,7 @@ function mod_theme_uninstall($theme_name) {
 	if (!hasPermission($config['mod']['themes']))
 		error($config['error']['noaccess']);
 	
-	$query = prepare("DELETE FROM `theme_settings` WHERE `theme` = :theme");
+	$query = prepare("DELETE FROM ``theme_settings`` WHERE `theme` = :theme");
 	$query->bindValue(':theme', $theme_name);
 	$query->execute() or error(db_error($query));
 
@@ -2164,7 +2166,7 @@ function mod_debug_antispam() {
 			$where .= ' AND `thread` = ' . $pdo->quote($_POST['thread']);
 		
 		if (isset($_POST['purge'])) {
-			$query = prepare(', DATE `antispam` SET `expires` = UNIX_TIMESTAMP() + :expires WHERE' . $where);
+			$query = prepare(', DATE ``antispam`` SET `expires` = UNIX_TIMESTAMP() + :expires WHERE' . $where);
 			$query->bindValue(':expires', $config['spam']['hidden_inputs_expire']);
 			$query->execute() or error(db_error());
 		}
@@ -2175,16 +2177,16 @@ function mod_debug_antispam() {
 		$where = '';
 	}
 	
-	$query = query('SELECT COUNT(*) FROM `antispam`' . ($where ? " WHERE $where" : '')) or error(db_error());
+	$query = query('SELECT COUNT(*) FROM ``antispam``' . ($where ? " WHERE $where" : '')) or error(db_error());
 	$args['total'] = number_format($query->fetchColumn());
 	
-	$query = query('SELECT COUNT(*) FROM `antispam` WHERE `expires` IS NOT NULL' . ($where ? " AND $where" : '')) or error(db_error());
+	$query = query('SELECT COUNT(*) FROM ``antispam`` WHERE `expires` IS NOT NULL' . ($where ? " AND $where" : '')) or error(db_error());
 	$args['expiring'] = number_format($query->fetchColumn());
 	
-	$query = query('SELECT * FROM `antispam` ' . ($where ? "WHERE $where" : '') . ' ORDER BY `passed` DESC LIMIT 40') or error(db_error());
+	$query = query('SELECT * FROM ``antispam`` ' . ($where ? "WHERE $where" : '') . ' ORDER BY `passed` DESC LIMIT 40') or error(db_error());
 	$args['top'] = $query->fetchAll(PDO::FETCH_ASSOC);
 	
-	$query = query('SELECT * FROM `antispam` ' . ($where ? "WHERE $where" : '') . ' ORDER BY `created` DESC LIMIT 20') or error(db_error());
+	$query = query('SELECT * FROM ``antispam`` ' . ($where ? "WHERE $where" : '') . ' ORDER BY `created` DESC LIMIT 20') or error(db_error());
 	$args['recent'] = $query->fetchAll(PDO::FETCH_ASSOC);
 	
 	mod_page(_('Debug: Anti-spam'), 'mod/debug/antispam.html', $args);
@@ -2200,7 +2202,7 @@ function mod_debug_recent_posts() {
 	// Manually build an SQL query
 	$query = 'SELECT * FROM (';
 	foreach ($boards as $board) {
-		$query .= sprintf('SELECT *, %s AS `board` FROM `posts_%s` UNION ALL ', $pdo->quote($board['uri']), $board['uri']);
+		$query .= sprintf('SELECT *, %s AS `board` FROM ``posts_%s`` UNION ALL ', $pdo->quote($board['uri']), $board['uri']);
 	}
 	// Remove the last "UNION ALL" seperator and complete the query
 	$query = preg_replace('/UNION ALL $/', ') AS `all_posts` ORDER BY `time` DESC LIMIT ' . $limit, $query);
diff --git a/install.php b/install.php
index 847876ab..2f51b22f 100644
--- a/install.php
+++ b/install.php
@@ -501,6 +501,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="" />
 		
@@ -668,7 +671,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>';
 	}
diff --git a/post.php b/post.php
index f4499845..22782ca7 100644
--- a/post.php
+++ b/post.php
@@ -48,7 +48,7 @@ if (isset($_POST['delete'])) {
 		error($config['error']['nodelete']);
 		
 	foreach ($delete as &$id) {
-		$query = prepare(sprintf("SELECT `thread`, `time`,`password` FROM `posts_%s` WHERE `id` = :id", $board['uri']));
+		$query = prepare(sprintf("SELECT `thread`, `time`,`password` FROM ``posts_%s`` WHERE `id` = :id", $board['uri']));
 		$query->bindValue(':id', $id, PDO::PARAM_INT);
 		$query->execute() or error(db_error($query));
 		
@@ -111,7 +111,7 @@ if (isset($_POST['delete'])) {
 	markup($reason);
 	
 	foreach ($report as &$id) {
-		$query = prepare(sprintf("SELECT `thread` FROM `posts_%s` WHERE `id` = :id", $board['uri']));
+		$query = prepare(sprintf("SELECT `thread` FROM ``posts_%s`` WHERE `id` = :id", $board['uri']));
 		$query->bindValue(':id', $id, PDO::PARAM_INT);
 		$query->execute() or error(db_error($query));
 		
@@ -123,7 +123,7 @@ if (isset($_POST['delete'])) {
 					'/' . $board['dir'] . $config['dir']['res'] . sprintf($config['file_page'], $thread ? $thread : $id) . ($thread ? '#' . $id : '') .
 					' for "' . $reason . '"'
 				);
-			$query = prepare("INSERT INTO `reports` VALUES (NULL, :time, :ip, :board, :post, :reason)");
+			$query = prepare("INSERT INTO ``reports`` VALUES (NULL, :time, :ip, :board, :post, :reason)");
 			$query->bindValue(':time', time(), PDO::PARAM_INT);
 			$query->bindValue(':ip', $_SERVER['REMOTE_ADDR'], PDO::PARAM_STR);
 			$query->bindValue(':board', $board['uri'], PDO::PARAM_INT);
@@ -227,7 +227,7 @@ if (isset($_POST['delete'])) {
 	
 	//Check if thread exists
 	if (!$post['op']) {
-		$query = prepare(sprintf("SELECT `sticky`,`locked`,`sage` FROM `posts_%s` WHERE `id` = :id AND `thread` IS NULL LIMIT 1", $board['uri']));
+		$query = prepare(sprintf("SELECT `sticky`,`locked`,`sage` FROM ``posts_%s`` WHERE `id` = :id AND `thread` IS NULL LIMIT 1", $board['uri']));
 		$query->bindValue(':id', $post['thread'], PDO::PARAM_INT);
 		$query->execute() or error(db_error());
 		
@@ -583,7 +583,7 @@ if (isset($_POST['delete'])) {
 	
 	if (isset($post['tracked_cites'])) {
 		foreach ($post['tracked_cites'] as $cite) {
-			$query = prepare('INSERT INTO `cites` VALUES (:board, :post, :target_board, :target)');
+			$query = prepare('INSERT INTO ``cites`` VALUES (:board, :post, :target_board, :target)');
 			$query->bindValue(':board', $board['uri']);
 			$query->bindValue(':post', $id, PDO::PARAM_INT);
 			$query->bindValue(':target_board',$cite[0]);
diff --git a/templates/posts.sql b/templates/posts.sql
index 698fad77..ca2ec304 100644
--- a/templates/posts.sql
+++ b/templates/posts.sql
@@ -1,4 +1,4 @@
-CREATE TABLE IF NOT EXISTS `posts_{{ board }}` (
+CREATE TABLE IF NOT EXISTS ``posts_{{ board }}`` (
    `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
    `thread` int(11) DEFAULT NULL,
    `subject` varchar(100) DEFAULT NULL,
diff --git a/templates/themes/basic/theme.php b/templates/themes/basic/theme.php
index 7ba0d1e7..6ba09ce6 100644
--- a/templates/themes/basic/theme.php
+++ b/templates/themes/basic/theme.php
@@ -25,7 +25,7 @@
 			
 			$settings['no_recent'] = (int) $settings['no_recent'];
 			
-			$query = query("SELECT * FROM `news` ORDER BY `time` DESC" . ($settings['no_recent'] ? ' LIMIT ' . $settings['no_recent'] : '')) or error(db_error());
+			$query = query("SELECT * FROM ``news`` ORDER BY `time` DESC" . ($settings['no_recent'] ? ' LIMIT ' . $settings['no_recent'] : '')) or error(db_error());
 			$news = $query->fetchAll(PDO::FETCH_ASSOC);
 			
 			return Element('themes/basic/index.html', Array(
diff --git a/templates/themes/catalog/theme.php b/templates/themes/catalog/theme.php
index 5c9f6769..4e2d40db 100644
--- a/templates/themes/catalog/theme.php
+++ b/templates/themes/catalog/theme.php
@@ -37,7 +37,7 @@
 			$recent_posts = array();
 			$stats = array();
 			
-			$query = query(sprintf("SELECT *, `id` AS `thread_id`, (SELECT COUNT(*) FROM `posts_%s` WHERE `thread` = `thread_id`) AS `reply_count`, '%s' AS `board` FROM `posts_%s` WHERE `thread` IS NULL ORDER BY `bump` DESC", $board_name, $board_name, $board_name)) or error(db_error());
+			$query = query(sprintf("SELECT *, `id` AS `thread_id`, (SELECT COUNT(*) FROM ``posts_%s`` WHERE `thread` = `thread_id`) AS `reply_count`, '%s' AS `board` FROM ``posts_%s`` WHERE `thread` IS NULL ORDER BY `bump` DESC", $board_name, $board_name, $board_name)) or error(db_error());
 			
 			while ($post = $query->fetch(PDO::FETCH_ASSOC)) {
 				$post['link'] = $config['root'] . $board['dir'] . $config['dir']['res'] . sprintf($config['file_page'], ($post['thread'] ? $post['thread'] : $post['id']));
diff --git a/templates/themes/categories/theme.php b/templates/themes/categories/theme.php
index 7d468d0d..74ed61ed 100644
--- a/templates/themes/categories/theme.php
+++ b/templates/themes/categories/theme.php
@@ -36,7 +36,7 @@
 		public static function news($settings) {
 			global $config;
 			
-			$query = query("SELECT * FROM `news` ORDER BY `time` DESC") or error(db_error());
+			$query = query("SELECT * FROM ``news`` ORDER BY `time` DESC") or error(db_error());
 			$news = $query->fetchAll(PDO::FETCH_ASSOC);
 			
 			return Element('themes/categories/news.html', Array(
diff --git a/templates/themes/frameset/theme.php b/templates/themes/frameset/theme.php
index 5fd9d29e..ffab0538 100644
--- a/templates/themes/frameset/theme.php
+++ b/templates/themes/frameset/theme.php
@@ -36,7 +36,7 @@
 		public static function news($settings) {
 			global $config;
 			
-			$query = query("SELECT * FROM `news` ORDER BY `time` DESC") or error(db_error());
+			$query = query("SELECT * FROM ``news`` ORDER BY `time` DESC") or error(db_error());
 			$news = $query->fetchAll(PDO::FETCH_ASSOC);
 			
 			return Element('themes/frameset/news.html', Array(
diff --git a/templates/themes/recent/theme.php b/templates/themes/recent/theme.php
index 98fabfa1..08d910f8 100644
--- a/templates/themes/recent/theme.php
+++ b/templates/themes/recent/theme.php
@@ -42,7 +42,7 @@
 			foreach ($boards as &$_board) {
 				if (in_array($_board['uri'], $this->excluded))
 					continue;
-				$query .= sprintf("SELECT *, '%s' AS `board` FROM `posts_%s` WHERE `file` IS NOT NULL AND `file` != 'deleted' AND `thumb` != 'spoiler' UNION ALL ", $_board['uri'], $_board['uri']);
+				$query .= sprintf("SELECT *, '%s' AS `board` FROM ``posts_%s`` WHERE `file` IS NOT NULL AND `file` != 'deleted' AND `thumb` != 'spoiler' UNION ALL ", $_board['uri'], $_board['uri']);
 			}
 			$query = preg_replace('/UNION ALL $/', 'ORDER BY `time` DESC LIMIT ' . (int)$settings['limit_images'], $query);
 			$query = query($query) or error(db_error());
@@ -62,7 +62,7 @@
 			foreach ($boards as &$_board) {
 				if (in_array($_board['uri'], $this->excluded))
 					continue;
-				$query .= sprintf("SELECT *, '%s' AS `board` FROM `posts_%s` UNION ALL ", $_board['uri'], $_board['uri']);
+				$query .= sprintf("SELECT *, '%s' AS `board` FROM ``posts_%s`` UNION ALL ", $_board['uri'], $_board['uri']);
 			}
 			$query = preg_replace('/UNION ALL $/', 'ORDER BY `time` DESC LIMIT ' . (int)$settings['limit_posts'], $query);
 			$query = query($query) or error(db_error());
@@ -82,7 +82,7 @@
 			foreach ($boards as &$_board) {
 				if (in_array($_board['uri'], $this->excluded))
 					continue;
-				$query .= sprintf("SELECT MAX(`id`) AS `top` FROM `posts_%s` UNION ALL ", $_board['uri']);
+				$query .= sprintf("SELECT MAX(`id`) AS `top` FROM ``posts_%s`` UNION ALL ", $_board['uri']);
 			}
 			$query = preg_replace('/UNION ALL $/', ') AS `posts_all`', $query);
 			$query = query($query) or error(db_error());
@@ -93,7 +93,7 @@
 			foreach ($boards as &$_board) {
 				if (in_array($_board['uri'], $this->excluded))
 					continue;
-				$query .= sprintf("SELECT `ip` FROM `posts_%s` UNION ALL ", $_board['uri']);
+				$query .= sprintf("SELECT `ip` FROM ``posts_%s`` UNION ALL ", $_board['uri']);
 			}
 			$query = preg_replace('/UNION ALL $/', ') AS `posts_all`', $query);
 			$query = query($query) or error(db_error());
@@ -104,7 +104,7 @@
 			foreach ($boards as &$_board) {
 				if (in_array($_board['uri'], $this->excluded))
 					continue;
-				$query .= sprintf("SELECT `filesize` FROM `posts_%s` UNION ALL ", $_board['uri']);
+				$query .= sprintf("SELECT `filesize` FROM ``posts_%s`` UNION ALL ", $_board['uri']);
 			}
 			$query = preg_replace('/UNION ALL $/', ') AS `posts_all`', $query);
 			$query = query($query) or error(db_error());
diff --git a/templates/themes/rrdtool/theme.php b/templates/themes/rrdtool/theme.php
index 0e0a2f15..a14169a3 100644
--- a/templates/themes/rrdtool/theme.php
+++ b/templates/themes/rrdtool/theme.php
@@ -61,7 +61,7 @@
 					// debug just the graphing (not updating) with the --debug switch
 					if (!isset($argv[1]) || $argv[1] != '--debug') {
 						// Update graph
-						$query = query(sprintf("SELECT MAX(`id`) FROM `posts_%s`", $board));
+						$query = query(sprintf("SELECT MAX(`id`) FROM ``posts_%s``", $board));
 						$count = $query->fetchColumn();
 					
 						if (!rrd_update($file, Array(
diff --git a/templates/themes/sitemap/theme.php b/templates/themes/sitemap/theme.php
index e210316b..226f8357 100644
--- a/templates/themes/sitemap/theme.php
+++ b/templates/themes/sitemap/theme.php
@@ -19,7 +19,7 @@
 		$threads = array();
 		
 		foreach ($boards as $board) {
-			$query = query(sprintf("SELECT `id` AS `thread_id`, (SELECT `time` FROM `posts_%s` WHERE `thread` = `thread_id` OR `id` = `thread_id` ORDER BY `time` DESC LIMIT 1) AS `lastmod` FROM `posts_%s` WHERE `thread` IS NULL", $board, $board)) or error(db_error());
+			$query = query(sprintf("SELECT `id` AS `thread_id`, (SELECT `time` FROM ``posts_%s`` WHERE `thread` = `thread_id` OR `id` = `thread_id` ORDER BY `time` DESC LIMIT 1) AS `lastmod` FROM ``posts_%s`` WHERE `thread` IS NULL", $board, $board)) or error(db_error());
 			$threads[$board] = $query->fetchAll(PDO::FETCH_ASSOC);
 		}
 				
-- 
cgit v1.3


From 9343651d90113f68b83f214c20a32975d18217e7 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Thu, 1 Aug 2013 01:16:20 -0400
Subject: Add optional database table prefix (issue #118; see issue comments
 for details)

---
 search.php                      | 13 ++++++++-----
 templates/themes/ukko/theme.php |  6 +++---
 2 files changed, 11 insertions(+), 8 deletions(-)

(limited to 'templates/themes')

diff --git a/search.php b/search.php
index 27ddbe15..a40c4701 100644
--- a/search.php
+++ b/search.php
@@ -17,21 +17,21 @@
 		$phrase = $_GET['search'];
 		$_body = '';
 		
-		$query = prepare("SELECT COUNT(*) FROM `search_queries` WHERE `ip` = :ip AND `time` > :time");
+		$query = prepare("SELECT COUNT(*) FROM ``search_queries`` WHERE `ip` = :ip AND `time` > :time");
 		$query->bindValue(':ip', $_SERVER['REMOTE_ADDR']);
 		$query->bindValue(':time', time() - ($queries_per_minutes[1] * 60));
 		$query->execute() or error(db_error($query));
 		if($query->fetchColumn() > $queries_per_minutes[0])
 			error(_('Wait a while before searching again, please.'));
 		
-		$query = prepare("SELECT COUNT(*) FROM `search_queries` WHERE `time` > :time");
+		$query = prepare("SELECT COUNT(*) FROM ``search_queries`` WHERE `time` > :time");
 		$query->bindValue(':time', time() - ($queries_per_minutes_all[1] * 60));
 		$query->execute() or error(db_error($query));
 		if($query->fetchColumn() > $queries_per_minutes_all[0])
 			error(_('Wait a while before searching again, please.'));
 			
 		
-		$query = prepare("INSERT INTO `search_queries` VALUES (:ip, :time, :query)");
+		$query = prepare("INSERT INTO ``search_queries`` VALUES (:ip, :time, :query)");
 		$query->bindValue(':ip', $_SERVER['REMOTE_ADDR']);
 		$query->bindValue(':time', time());
 		$query->bindValue(':query', $phrase);
@@ -40,7 +40,7 @@
 		_syslog(LOG_NOTICE, 'Searched /' . $_GET['board'] . '/ for "' . $phrase . '"');
 
 		// Cleanup search queries table
-		$query = prepare("DELETE FROM `search_queries` WHERE `time` <= :time");
+		$query = prepare("DELETE FROM ``search_queries`` WHERE `time` <= :time");
 		$query->bindValue(':time', time() - ($queries_per_minutes_all[1] * 60));
                 $query->execute() or error(db_error($query));
 		
@@ -85,6 +85,9 @@
 		// Use asterisk as wildcard to suit convention
 		$phrase = str_replace('*', '%', $phrase);
 		
+		// Remove `, it's used by table prefix magic
+		$phrase = str_replace('`', '!`', $phrase);
+
 		$like = '';
 		$match = Array();
 		
@@ -119,7 +122,7 @@
 		
 		$like = str_replace('%', '%%', $like);
 			
-		$query = prepare(sprintf("SELECT * FROM `posts_%s` WHERE " . $like . " ORDER BY `time` DESC LIMIT :limit", $board['uri']));
+		$query = prepare(sprintf("SELECT * FROM ``posts_%s`` WHERE " . $like . " ORDER BY `time` DESC LIMIT :limit", $board['uri']));
 		$query->bindValue(':limit', $search_limit, PDO::PARAM_INT);
 		$query->execute() or error(db_error($query));
 		
diff --git a/templates/themes/ukko/theme.php b/templates/themes/ukko/theme.php
index 6fa5fa7e..1682b4ec 100644
--- a/templates/themes/ukko/theme.php
+++ b/templates/themes/ukko/theme.php
@@ -25,7 +25,7 @@
 			foreach($boards as &$_board) {
 				if(in_array($_board['uri'], explode(' ', $this->settings['exclude'])))
 					continue;
-				$query .= sprintf("SELECT *, '%s' AS `board` FROM `posts_%s` WHERE `thread` IS NULL UNION ALL ", $_board['uri'], $_board['uri']);
+				$query .= sprintf("SELECT *, '%s' AS `board` FROM ``posts_%s`` WHERE `thread` IS NULL UNION ALL ", $_board['uri'], $_board['uri']);
 			}
 			$query = preg_replace('/UNION ALL $/', 'ORDER BY `bump` DESC', $query);
 			$query = query($query) or error(db_error());
@@ -48,7 +48,7 @@
 						$post['filename'], $post['ip'], $post['sticky'], $post['locked'], $post['sage'], $post['embed'], $mod ? '?/' : $config['root'], $mod
 					);
 
-					$posts = prepare(sprintf("SELECT * FROM `posts_%s` WHERE `thread` = :id ORDER BY `id` DESC LIMIT :limit", $post['board']));
+					$posts = prepare(sprintf("SELECT * FROM ``posts_%s`` WHERE `thread` = :id ORDER BY `id` DESC LIMIT :limit", $post['board']));
 					$posts->bindValue(':id', $post['id']);
 					$posts->bindValue(':limit', ($post['sticky'] ? $config['threads_preview_sticky'] : $config['threads_preview']), PDO::PARAM_INT);
 					$posts->execute() or error(db_error($posts));
@@ -66,7 +66,7 @@
 					
 					}
 					if ($posts->rowCount() == ($post['sticky'] ? $config['threads_preview_sticky'] : $config['threads_preview'])) {
-						$ct = prepare(sprintf("SELECT COUNT(`id`) as `num` FROM `posts_%s` WHERE `thread` = :thread UNION ALL SELECT COUNT(`id`) FROM `posts_%s` WHERE `file` IS NOT NULL AND `thread` = :thread", $post['board'], $post['board']));
+						$ct = prepare(sprintf("SELECT COUNT(`id`) as `num` FROM ``posts_%s`` WHERE `thread` = :thread UNION ALL SELECT COUNT(`id`) FROM `posts_%s` WHERE `file` IS NOT NULL AND `thread` = :thread", $post['board'], $post['board']));
 						$ct->bindValue(':thread', $post['id'], PDO::PARAM_INT);
 						$ct->execute() or error(db_error($count));
 						
-- 
cgit v1.3


From 6f6a20af8eb779f4b8dd703e3d87e72ad9b67908 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Fri, 2 Aug 2013 03:16:34 -0400
Subject: ukko: javascript major refactor

---
 templates/themes/ukko/ukko.js | 37 +++++++++++++++++++++++++++----------
 1 file changed, 27 insertions(+), 10 deletions(-)

(limited to 'templates/themes')

diff --git a/templates/themes/ukko/ukko.js b/templates/themes/ukko/ukko.js
index 6566335e..99c737d6 100644
--- a/templates/themes/ukko/ukko.js
+++ b/templates/themes/ukko/ukko.js
@@ -1,20 +1,30 @@
+(function(){
+
 var cache = new Array(),
 	thread = false,
 	loading = false;
 $(document).ready(function() {
+	$('.pages').hide();
 	$(window).on('scroll', function() {
-		if($(window).scrollTop() + $(window).height() + 100 > $(document).height() && !loading && overflow.length > 0) {
+		if (overflow.length == 0) {
+			$('.pages').show().html(_("No more threads to display"));
+		}
+		while($(window).scrollTop() + $(window).height() + 500 > $(document).height() && !loading && overflow.length > 0) {
 			var page = '../' + overflow[0].board + '/' + overflow[0].page;
-			if($.inArray(page, cache) != -1) {
-				thread = $('div#thread_' + overflow[0].id);
-				if(thread.length > 0) {
-					thread.prepend('<h2><a href="/' + overflow[0].board + '/">/' + overflow[0].board + '/</a></h2>');
-					$('div[id*="thread_"]').last().after(thread.attr('data-board', overflow[0].board).css('display', 'block'));
-					$(document).trigger('new_post', thread);
-					overflow.shift();
-				}
+			thread = $('div#thread_' + overflow[0].id + '[data-board="' + overflow[0].board + '"]');
+			if (thread.length > 0 && thread.css('display') != 'none') { // already present
+				overflow.shift();
+				continue;
+			}
+
+			if($.inArray(page, cache) != -1 && thread.length > 0) {
+				thread.prepend('<h2><a href="/' + overflow[0].board + '/">/' + overflow[0].board + '/</a></h2>');
+				$('div[id*="thread_"]').last().after(thread.attr('data-board', overflow[0].board).css('display', 'block'));
+				$(document).trigger('new_post', thread);
+				overflow.shift();
 			} else {
 				loading = true;
+				$('.pages').show().html(_("Loading..."));
 				$.get(page, function(data) {
 					cache.push(page);
 
@@ -23,16 +33,23 @@ $(document).ready(function() {
 					});
 
 					thread = $('div#thread_' + overflow[0].id + '[data-board="' + overflow[0].board + '"]');
-					if(thread.length > 0) {
+					if(thread.length > 0 && thread.css('display') != 'none') {
 						thread.prepend('<h2><a href="/' + overflow[0].board + '/">/' + overflow[0].board + '/</a></h2>');
 						$('div[id*="thread_"]').last().after(thread.attr('data-board', overflow[0].board).css('display', 'block'));
 						$(document).trigger('new_post', thread);
 						overflow.shift();
 					}
+					else {
+						overflow.shift(); // We missed it? Or already present...
+					}
 
 					loading = false;
+					$('.pages').hide().html("");
 				});
+				break;
 			}
 		}
 	});
 });
+
+})();
-- 
cgit v1.3


From 73b5cf5a08c395e706e8bc3ac8032bfbc810376f Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Fri, 2 Aug 2013 04:20:57 -0400
Subject: ukko: implement ukko hide

---
 templates/themes/ukko/ukko.js | 65 ++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 58 insertions(+), 7 deletions(-)

(limited to 'templates/themes')

diff --git a/templates/themes/ukko/ukko.js b/templates/themes/ukko/ukko.js
index 99c737d6..9011c754 100644
--- a/templates/themes/ukko/ukko.js
+++ b/templates/themes/ukko/ukko.js
@@ -3,7 +3,54 @@
 var cache = new Array(),
 	thread = false,
 	loading = false;
+
+if (localStorage.hiddenboards !== null) {
+	localStorage.hiddenboards = "{}";
+}
+
+// Load data from HTML5 localStorage
+var hiddenboards = JSON.parse(localStorage.hiddenboards);
+                
+var storeboards = function() {
+        localStorage.hiddenboards = JSON.stringify(hiddenboards);
+};
+
 $(document).ready(function() {
+	var addukkohide = function() {
+		var ukkohide = $('<a href="javascript:void(0);" class="unimportant ukkohide"></a>');
+		var board = $(this).next().data("board");
+		var hr = $("<hr />");
+
+		$(this).append(ukkohide);
+		$(this).append(hr);
+
+		if (hiddenboards[board] !== true) {
+			ukkohide.html(_("(hide threads from this board)"));
+			hr.hide();
+		}
+		else {
+			ukkohide.html(_("(show threads from this board)"));
+			$(this).next().hide();
+		}
+		ukkohide.click(function() {
+			hiddenboards[board] = (hiddenboards[board] !== true);
+			if (hiddenboards[board] !== true) {
+                        	$('[data-board="'+board+'"][data-cached!="yes"]').show().prev().
+					find('.ukkohide').html(_("(hide threads from this board)")).
+					parent().find('hr').hide();
+                	}
+                	else {
+                        	$('[data-board="'+board+'"][data-cached!="yes"]').hide().prev().
+					find('.ukkohide').html(_("(show threads from this board)"))
+					.parent().find('hr').show();
+                	}
+			storeboards();
+			return false;
+		});
+
+	};
+	$("h2").each(addukkohide);
+
 	$('.pages').hide();
 	$(window).on('scroll', function() {
 		if (overflow.length == 0) {
@@ -12,14 +59,17 @@ $(document).ready(function() {
 		while($(window).scrollTop() + $(window).height() + 500 > $(document).height() && !loading && overflow.length > 0) {
 			var page = '../' + overflow[0].board + '/' + overflow[0].page;
 			thread = $('div#thread_' + overflow[0].id + '[data-board="' + overflow[0].board + '"]');
-			if (thread.length > 0 && thread.css('display') != 'none') { // already present
+			if (thread.length > 0 && thread.data("cached") !== 'yes') { // already present
 				overflow.shift();
 				continue;
 			}
 
+			var boardheader = $('<h2><a href="/' + overflow[0].board + '/">/' + overflow[0].board + '/</a> </h2>');
+
 			if($.inArray(page, cache) != -1 && thread.length > 0) {
-				thread.prepend('<h2><a href="/' + overflow[0].board + '/">/' + overflow[0].board + '/</a></h2>');
-				$('div[id*="thread_"]').last().after(thread.attr('data-board', overflow[0].board).css('display', 'block'));
+				$('div[id*="thread_"]').last().after(thread.attr('data-board', overflow[0].board).data("cached", "no").css('display', 'block'));
+				boardheader.insertBefore(thread);
+				addukkohide.call(boardheader);
 				$(document).trigger('new_post', thread);
 				overflow.shift();
 			} else {
@@ -29,13 +79,14 @@ $(document).ready(function() {
 					cache.push(page);
 
 					$(data).find('div[id*="thread_"]').each(function() {
-						$('form[name="postcontrols"]').prepend($(this).css('display', 'none').attr('data-board', overflow[0].board));
+						$('form[name="postcontrols"]').prepend($(this).css('display', 'none').data("cached", "yes").attr('data-board', overflow[0].board));
 					});
 
 					thread = $('div#thread_' + overflow[0].id + '[data-board="' + overflow[0].board + '"]');
-					if(thread.length > 0 && thread.css('display') != 'none') {
-						thread.prepend('<h2><a href="/' + overflow[0].board + '/">/' + overflow[0].board + '/</a></h2>');
-						$('div[id*="thread_"]').last().after(thread.attr('data-board', overflow[0].board).css('display', 'block'));
+					if(thread.length > 0 && thread.data('cached') !== 'no') {
+						$('div[id*="thread_"]').last().after(thread.attr('data-board', overflow[0].board).data("cached", "no").css('display', 'block'));
+						boardheader.insertBefore(thread);
+						addukkohide.call(boardheader);
 						$(document).trigger('new_post', thread);
 						overflow.shift();
 					}
-- 
cgit v1.3


From 3922677968cd4228be0e37943de131282b9eb1e4 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Fri, 2 Aug 2013 04:36:08 -0400
Subject: ukko: bugfixes

---
 templates/themes/ukko/ukko.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'templates/themes')

diff --git a/templates/themes/ukko/ukko.js b/templates/themes/ukko/ukko.js
index 9011c754..11617593 100644
--- a/templates/themes/ukko/ukko.js
+++ b/templates/themes/ukko/ukko.js
@@ -35,12 +35,12 @@ $(document).ready(function() {
 		ukkohide.click(function() {
 			hiddenboards[board] = (hiddenboards[board] !== true);
 			if (hiddenboards[board] !== true) {
-                        	$('[data-board="'+board+'"][data-cached!="yes"]').show().prev().
+                        	$('[data-board="'+board+'"]:not([data-cached="yes"])').show().prev().
 					find('.ukkohide').html(_("(hide threads from this board)")).
 					parent().find('hr').hide();
                 	}
                 	else {
-                        	$('[data-board="'+board+'"][data-cached!="yes"]').hide().prev().
+                        	$('[data-board="'+board+'"]:not([data-cached="yes"])').hide().prev().
 					find('.ukkohide').html(_("(show threads from this board)"))
 					.parent().find('hr').show();
                 	}
@@ -59,7 +59,7 @@ $(document).ready(function() {
 		while($(window).scrollTop() + $(window).height() + 500 > $(document).height() && !loading && overflow.length > 0) {
 			var page = '../' + overflow[0].board + '/' + overflow[0].page;
 			thread = $('div#thread_' + overflow[0].id + '[data-board="' + overflow[0].board + '"]');
-			if (thread.length > 0 && thread.data("cached") !== 'yes') { // already present
+			if (thread.length > 0 && thread.attr("data-cached") !== 'yes') { // already present
 				overflow.shift();
 				continue;
 			}
@@ -67,7 +67,7 @@ $(document).ready(function() {
 			var boardheader = $('<h2><a href="/' + overflow[0].board + '/">/' + overflow[0].board + '/</a> </h2>');
 
 			if($.inArray(page, cache) != -1 && thread.length > 0) {
-				$('div[id*="thread_"]').last().after(thread.attr('data-board', overflow[0].board).data("cached", "no").css('display', 'block'));
+				$('div[id*="thread_"]').last().after(thread.attr('data-board', overflow[0].board).attr("data-cached", "no").css('display', 'block'));
 				boardheader.insertBefore(thread);
 				addukkohide.call(boardheader);
 				$(document).trigger('new_post', thread);
@@ -79,12 +79,12 @@ $(document).ready(function() {
 					cache.push(page);
 
 					$(data).find('div[id*="thread_"]').each(function() {
-						$('form[name="postcontrols"]').prepend($(this).css('display', 'none').data("cached", "yes").attr('data-board', overflow[0].board));
+						$('form[name="postcontrols"]').prepend($(this).css('display', 'none').attr("data-cached", "yes").attr('data-board', overflow[0].board));
 					});
 
 					thread = $('div#thread_' + overflow[0].id + '[data-board="' + overflow[0].board + '"]');
-					if(thread.length > 0 && thread.data('cached') !== 'no') {
-						$('div[id*="thread_"]').last().after(thread.attr('data-board', overflow[0].board).data("cached", "no").css('display', 'block'));
+					if(thread.length > 0 && thread.attr('data-cached') !== 'no') {
+						$('div[id*="thread_"]').last().after(thread.attr('data-board', overflow[0].board).attr("data-cached", "no").css('display', 'block'));
 						boardheader.insertBefore(thread);
 						addukkohide.call(boardheader);
 						$(document).trigger('new_post', thread);
-- 
cgit v1.3


From c2ba0bc7bfe8bac43b95fbb986f93444476059d3 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Sat, 3 Aug 2013 21:59:05 -0400
Subject: ukko: fix thread duplication

---
 templates/themes/ukko/ukko.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'templates/themes')

diff --git a/templates/themes/ukko/ukko.js b/templates/themes/ukko/ukko.js
index 11617593..f89fa5c7 100644
--- a/templates/themes/ukko/ukko.js
+++ b/templates/themes/ukko/ukko.js
@@ -83,7 +83,9 @@ $(document).ready(function() {
 					});
 
 					thread = $('div#thread_' + overflow[0].id + '[data-board="' + overflow[0].board + '"]');
-					if(thread.length > 0 && thread.attr('data-cached') !== 'no') {
+					var existingthread = $('div#thread_' + overflow[0].id + '[data-board="' + overflow[0].board + '"][data-cached="no"]');
+
+					if(existingthread.length == 0 && thread.length > 0 && thread.attr('data-cached') !== 'no') {
 						$('div[id*="thread_"]').last().after(thread.attr('data-board', overflow[0].board).attr("data-cached", "no").css('display', 'block'));
 						boardheader.insertBefore(thread);
 						addukkohide.call(boardheader);
-- 
cgit v1.3


From ddcad35f6ca434c8082e29db9ad92daab385a6ef Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Sat, 3 Aug 2013 22:17:25 -0400
Subject: ukko: another fix

---
 templates/themes/ukko/ukko.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'templates/themes')

diff --git a/templates/themes/ukko/ukko.js b/templates/themes/ukko/ukko.js
index f89fa5c7..2c5989ab 100644
--- a/templates/themes/ukko/ukko.js
+++ b/templates/themes/ukko/ukko.js
@@ -82,10 +82,9 @@ $(document).ready(function() {
 						$('form[name="postcontrols"]').prepend($(this).css('display', 'none').attr("data-cached", "yes").attr('data-board', overflow[0].board));
 					});
 
-					thread = $('div#thread_' + overflow[0].id + '[data-board="' + overflow[0].board + '"]');
-					var existingthread = $('div#thread_' + overflow[0].id + '[data-board="' + overflow[0].board + '"][data-cached="no"]');
+					thread = $('div#thread_' + overflow[0].id + '[data-board="' + overflow[0].board + '"][data-cached="yes"]');
 
-					if(existingthread.length == 0 && thread.length > 0 && thread.attr('data-cached') !== 'no') {
+					if(thread.length > 0) {
 						$('div[id*="thread_"]').last().after(thread.attr('data-board', overflow[0].board).attr("data-cached", "no").css('display', 'block'));
 						boardheader.insertBefore(thread);
 						addukkohide.call(boardheader);
-- 
cgit v1.3


From f2427ca3920147b294f07f58aadcf95cb70447a9 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Sun, 4 Aug 2013 00:15:56 -0400
Subject: ukko: finally fixed that post (du|multi)plication problem

---
 templates/themes/ukko/ukko.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'templates/themes')

diff --git a/templates/themes/ukko/ukko.js b/templates/themes/ukko/ukko.js
index 2c5989ab..d8693db3 100644
--- a/templates/themes/ukko/ukko.js
+++ b/templates/themes/ukko/ukko.js
@@ -79,7 +79,10 @@ $(document).ready(function() {
 					cache.push(page);
 
 					$(data).find('div[id*="thread_"]').each(function() {
-						$('form[name="postcontrols"]').prepend($(this).css('display', 'none').attr("data-cached", "yes").attr('data-board', overflow[0].board));
+						var checkout = $(this).attr('id').replace('thread_', '');
+						if ($('div#thread_' + checkout + '[data-board="' + overflow[0].board + '"]').length == 0) {
+							$('form[name="postcontrols"]').prepend($(this).css('display', 'none').attr("data-cached", "yes").attr('data-board', overflow[0].board));
+						}
 					});
 
 					thread = $('div#thread_' + overflow[0].id + '[data-board="' + overflow[0].board + '"][data-cached="yes"]');
-- 
cgit v1.3


From e2b5ec93547bde60244190aa7dd00b4f3523e1e0 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Sun, 4 Aug 2013 01:36:56 -0400
Subject: ukko: further fixes; should now provide a smooth overboard experience

---
 templates/themes/ukko/ukko.js | 33 +++++++++++++++++++--------------
 1 file changed, 19 insertions(+), 14 deletions(-)

(limited to 'templates/themes')

diff --git a/templates/themes/ukko/ukko.js b/templates/themes/ukko/ukko.js
index d8693db3..4a36b394 100644
--- a/templates/themes/ukko/ukko.js
+++ b/templates/themes/ukko/ukko.js
@@ -2,8 +2,8 @@
 
 var cache = new Array(),
 	thread = false,
-	loading = false;
-
+	loading = false,
+	ukkotimer = false;
 if (localStorage.hiddenboards !== null) {
 	localStorage.hiddenboards = "{}";
 }
@@ -52,11 +52,11 @@ $(document).ready(function() {
 	$("h2").each(addukkohide);
 
 	$('.pages').hide();
-	$(window).on('scroll', function() {
+	var loadnext = function() {
 		if (overflow.length == 0) {
 			$('.pages').show().html(_("No more threads to display"));
 		}
-		while($(window).scrollTop() + $(window).height() + 500 > $(document).height() && !loading && overflow.length > 0) {
+		while($(window).scrollTop() + $(window).height() + 1000 > $(document).height() && !loading && overflow.length > 0) {
 			var page = '../' + overflow[0].board + '/' + overflow[0].page;
 			thread = $('div#thread_' + overflow[0].id + '[data-board="' + overflow[0].board + '"]');
 			if (thread.length > 0 && thread.attr("data-cached") !== 'yes') { // already present
@@ -66,11 +66,13 @@ $(document).ready(function() {
 
 			var boardheader = $('<h2><a href="/' + overflow[0].board + '/">/' + overflow[0].board + '/</a> </h2>');
 
-			if($.inArray(page, cache) != -1 && thread.length > 0) {
-				$('div[id*="thread_"]').last().after(thread.attr('data-board', overflow[0].board).attr("data-cached", "no").css('display', 'block'));
-				boardheader.insertBefore(thread);
-				addukkohide.call(boardheader);
-				$(document).trigger('new_post', thread);
+			if($.inArray(page, cache) != -1) {
+				if (thread.length > 0) {
+					$('div[id*="thread_"]').last().after(thread.attr('data-board', overflow[0].board).attr("data-cached", "no").css('display', 'block'));
+					boardheader.insertBefore(thread);
+					addukkohide.call(boardheader);
+					$(document).trigger('new_post', thread);
+				}
 				overflow.shift();
 			} else {
 				loading = true;
@@ -92,11 +94,8 @@ $(document).ready(function() {
 						boardheader.insertBefore(thread);
 						addukkohide.call(boardheader);
 						$(document).trigger('new_post', thread);
-						overflow.shift();
-					}
-					else {
-						overflow.shift(); // We missed it? Or already present...
 					}
+					overflow.shift();
 
 					loading = false;
 					$('.pages').hide().html("");
@@ -104,7 +103,13 @@ $(document).ready(function() {
 				break;
 			}
 		}
-	});
+		clearTimeout(ukkotimer);
+		ukkotimer = setTimeout(loadnext, 1000);
+	};
+
+	$(window).on('scroll', loadnext);
+
+	ukkotimer = setTimeout(loadnext, 1000);
 });
 
 })();
-- 
cgit v1.3