Merge branch 'dev' into 'dev'

Better spoiler BBcode tag conversion to Markdown

See merge request hubzilla/core!1718
This commit is contained in:
Max Kostikov 2019-08-24 00:00:58 +02:00
commit df842a8e8d

View File

@ -266,7 +266,7 @@ function bb_to_markdown($Text, $options = []) {
$Text = preg_replace("/\[zrl\=\].*?\[\/zrl\]/is", "", $Text);
// Remove unprocessed spoiler HTML tags
$Text = strip_tags(preg_replace("/(<\/div>)(>.+)$/im", "$1\n$2", $Text));
$Text = preg_replace("/<div.+>([^<]+)<.+>(>.+)$/im", "$1\n$2", $Text);
$Text = trim($Text);