From 471525a58bc59399066eaffb6e593b432ec854a8 Mon Sep 17 00:00:00 2001 From: Michael Foster Date: Thu, 29 Aug 2013 21:05:03 +1000 Subject: [PATCH] HTML Tidy fixes: UTF-8, preserving whitespace, keep attributes literal, don't wrap text --- inc/functions.php | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/inc/functions.php b/inc/functions.php index f99713f7..22a6d9ff 100644 --- a/inc/functions.php +++ b/inc/functions.php @@ -1731,16 +1731,22 @@ function markup(&$body, $track_cites = false) { $body = preg_replace('/\s+$/', '', $body); $body = preg_replace("/\n/", '
', $body); - + if ($config['markup_repair_tidy']) { $tidy = new tidy(); - $body = $tidy->repairString($body, array( - 'doctype' => 'omit' - )); + $body = $tidy->repairString(str_replace(' ', ' ', $body), array( + 'doctype' => 'omit', + 'bare' => true, + 'literal-attributes' => true, + 'quote-nbsp' => true, + 'indent' => false, + 'show-body-only' => true, + 'wrap' => 0, + 'output-bom' => false, + ), 'utf8'); $body = str_replace("\n", '', $body); - $body = preg_replace('@^.+|.+$@', '', $body); } - + return $tracked_cites; }