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

Conflicts:
	templates/thread.html

1 files changed, 7 insertions, 3 deletions

diff --git a/post.php b/post.php
index f6cdcb00..42e2bfcc 100644
--- a/post.php
+++ b/post.php
@@ -108,7 +108,7 @@ if (isset($_POST['delete'])) {
 	if (count($report) > $config['report_limit'])
 		error($config['error']['toomanyreports']);
 	
-	$reason = &$_POST['reason'];
+	$reason = escape_markup_modifiers($_POST['reason']);
 	markup($reason);
 	
 	foreach ($report as &$id) {
@@ -379,6 +379,11 @@ if (isset($_POST['delete'])) {
 		error(sprintf($config['error']['toolong'], 'password'));
 		
 	wordfilters($post['body']);
+	$post['body'] = escape_markup_modifiers($post['body']);
+	
+	if ($mod && isset($post['raw']) && $post['raw']) {
+		$post['body'] = '<tinyboard raw html>' . $post['body'] . '</tinyboard>';
+	}
 	
 	if (mysql_version() >= 50503) {
 		$post['body_nomarkup'] = $post['body']; // Assume we're using the utf8mb4 charset
@@ -397,8 +402,7 @@ if (isset($_POST['delete'])) {
 		}
 	}
 	
-	if (!($mod && isset($post['raw']) && $post['raw']))
-		$post['tracked_cites'] = markup($post['body'], true);
+	$post['tracked_cites'] = markup($post['body'], true);
 	
 	// Check for a flood
 	if (!hasPermission($config['mod']['flood'], $board['uri']) && checkFlood($post)) {