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

Conflicts:
	inc/config.php
	inc/functions.php
	install.php
	stylesheets/dark_roach.css

1 files changed, 5 insertions, 2 deletions

diff --git a/inc/anti-bot.php b/inc/anti-bot.php
index fde97096..41e0a1d6 100644
--- a/inc/anti-bot.php
+++ b/inc/anti-bot.php
@@ -178,11 +178,14 @@ class AntiBot {
 }
 
 function _create_antibot($board, $thread) {
-	global $config;
+	global $config, $purged_old_antispam;
 	
 	$antibot = new AntiBot(array($board, $thread));
 	
-	query('DELETE FROM ``antispam`` WHERE `expires` < UNIX_TIMESTAMP()') or error(db_error());
+	if (!isset($purged_old_antispam)) {
+		$purged_old_antispam = true;
+		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');