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

Conflicts:
	inc/config.php
	inc/display.php
	inc/mod/pages.php
	js/catalog-link.js
	post.php
	templates/banned.html

1 files changed, 13 insertions, 20 deletions

diff --git a/post.php b/post.php
index 98709d97..4c34b806 100644
--- a/post.php
+++ b/post.php
@@ -117,26 +117,19 @@ if (isset($_POST['delete'])) {
 		$query->execute() or error(db_error($query));
 		
 		$thread = $query->fetchColumn();
-
-		// If they are not reporting a reply, report the OP.
-		if (!$thread) { 
-			$thread = $id;
-		}		
-
-		if ($thread) {
-			if ($config['syslog'])
-				_syslog(LOG_INFO, 'Reported post: ' .
-					'/' . $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->bindValue(':time', time(), PDO::PARAM_INT);
-			$query->bindValue(':ip', $_SERVER['REMOTE_ADDR'], PDO::PARAM_STR);
-			$query->bindValue(':board', $board['uri'], PDO::PARAM_INT);
-			$query->bindValue(':post', $id, PDO::PARAM_INT);
-			$query->bindValue(':reason', $reason, PDO::PARAM_STR);
-			$query->execute() or error(db_error($query));
-		}
+		
+		if ($config['syslog'])
+			_syslog(LOG_INFO, 'Reported post: ' .
+				'/' . $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->bindValue(':time', time(), PDO::PARAM_INT);
+		$query->bindValue(':ip', $_SERVER['REMOTE_ADDR'], PDO::PARAM_STR);
+		$query->bindValue(':board', $board['uri'], PDO::PARAM_INT);
+		$query->bindValue(':post', $id, PDO::PARAM_INT);
+		$query->bindValue(':reason', $reason, PDO::PARAM_STR);
+		$query->execute() or error(db_error($query));
 	}
 	
 	$is_mod = isset($_POST['mod']) && $_POST['mod'];