From 478014f02a9241ec6d5b5e9672968897176302d2 Mon Sep 17 00:00:00 2001 From: Max Kostikov Date: Fri, 8 Nov 2019 23:35:05 +0100 Subject: Better BBcode to Markdown conversion --- include/markdown.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'include/markdown.php') diff --git a/include/markdown.php b/include/markdown.php index 213986867..69cc264df 100644 --- a/include/markdown.php +++ b/include/markdown.php @@ -246,6 +246,9 @@ function bb_to_markdown($Text, $options = []) { call_hooks('bb_to_markdown_bb', $x); $Text = $x['bbcode']; + + // Replace spoiler tag before BBcode conversion + $Text = preg_replace("/\[\/?spoiler\]/is", "\n--- " .t('spoiler') . " ---\n", $Text); // Convert it to HTML - don't try oembed $Text = bbcode($Text, [ 'tryoembed' => false ]); @@ -265,8 +268,8 @@ function bb_to_markdown($Text, $options = []) { // Remove empty zrl links $Text = preg_replace("/\[zrl\=\].*?\[\/zrl\]/is", "", $Text); - // Remove unprocessed spoiler HTML tags - $Text = preg_replace("/([^<]+)<.+>(>.+)$/im", "$1\n$2", $Text); + // Replace unprocessed
in code + $Text = str_replace("

", "\n", $Text); $Text = trim($Text); -- cgit v1.2.3