kashire/lainchan
4
0
Fork 0
Code Issues 18 Pull Requests Releases Wiki Activity

Fix markup again. And add the option to repair fucked up nesting (and more) with HTML Tidy ($config['markup_repair_tidy'])

Browse Source
This commit is contained in:
Michael Foster 2013-08-29 15:56:36 +10:00
parent 3b63cad71f
commit 7b817eea11
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
inc/config.php
View File

@ -459,10 +459,10 @@
*/
// "Wiki" markup syntax ($config['wiki_markup'] in pervious versions):
$config['markup'][] = array("/'''([^<]+?)'''/", "<strong>\$1</strong>");
$config['markup'][] = array("/''([^<]+?)''/", "<em>\$1</em>");
$config['markup'][] = array("/\*\*([^<]+?)\*\*/", "<span class=\"spoiler\">\$1</span>");
// $config['markup'][] = array("/^[ |\t]*==([^<]+?)==[ |\t]*$/m", "<span class=\"heading\">\$1</span>");
$config['markup'][] = array("/'''(.+?)'''/", "<strong>\$1</strong>");
$config['markup'][] = array("/''(.+?)''/", "<em>\$1</em>");
$config['markup'][] = array("/\*\*(.+?)\*\*/", "<span class=\"spoiler\">\$1</span>");
// $config['markup'][] = array("/^[ |\t]*==(.+?)==[ |\t]*$/m", "<span class=\"heading\">\$1</span>");
// Highlight PHP code wrapped in <code> tags (PHP 5.3+)
// $config['markup'][] = array(
@ -472,6 +472,10 @@
// }
// );
// Repair markup with HTML Tidy. This may be slower, but most if the time it solves nesting mistakes.
// Tinyboad, at the time of writing this, can not prevent out-of-order markup tags (eg. "**''test**'').
$config['markup_repair_tidy'] = false;
// Always regenerate markup. This isn't recommended and should only be used for debugging; by default,
// Tinyboard only parses post markup when it needs to, and keeps post-markup HTML in the database. This
// will significantly impact performance when enabled.

11
inc/functions.php
View File

@ -1728,7 +1728,16 @@ function markup(&$body, $track_cites = false) {
$body = preg_replace('/\s+$/', '', $body);
$body = preg_replace("/\n/", '<br/>', $body);
if ($config['markup_repair_tidy']) {
$tidy = new tidy();
$body = $tidy->repairString($body, array(
'doctype' => 'omit'
));
$body = str_replace("\n", '', $body);
$body = preg_replace('@^.+<body>|</body>.+$@', '', $body);
}
return $tracked_cites;
}