Fix \t in posts (editing posts, and HTML Tidy)

inc/functions.php

@@ -1580,9 +1580,6 @@ function markup(&$body, $track_cites = false) {
 		}
 	}
 
-	// replace tabs with 8 spaces
-	$body = str_replace("\t", '        ', $body);
-
 	$tracked_cites = array();
 
 	// Cites
@@ -1748,6 +1745,7 @@ function markup(&$body, $track_cites = false) {
 	
 	if ($config['markup_repair_tidy']) {
 		$tidy = new tidy();
+		$body = str_replace("\t", '	', $body);
 		$body = $tidy->repairString($body, array(
 			'doctype' => 'omit',
 			'bare' => true,
@@ -1759,10 +1757,12 @@ function markup(&$body, $track_cites = false) {
 			'output-html' => true,
 			'newline' => 'LF',
 			'quiet' => true,
-			
 		), 'utf8');
 		$body = str_replace("\n", '', $body);
 	}
+	
+	// replace tabs with 8 spaces
+	$body = str_replace("\t", '        ', $body);
 		
 	return $tracked_cites;
 }

inc/mod/pages.php

@@ -1317,6 +1317,8 @@ function mod_edit_post($board, $edit_raw_html, $postID) {
 			$post['body'] = str_replace("\n", '
', utf8tohtml($post['body']));
 			$post['body_nomarkup'] = str_replace("\r", '', $post['body_nomarkup']);
 			$post['body'] = str_replace("\r", '', $post['body']);
+			$post['body_nomarkup'] = str_replace("\t", '	', $post['body_nomarkup']);
+			$post['body'] = str_replace("\t", '	', $post['body']);
 		}
 				
 		mod_page(_('Edit post'), 'mod/edit_post_form.html', array('token' => $security_token, 'board' => $board, 'raw' => $edit_raw_html, 'post' => $post));