diff options
| author | Max Kostikov <max@kostikov.co> | 2019-08-24 00:00:58 +0200 |
|---|---|---|
| committer | Max Kostikov <max@kostikov.co> | 2019-08-24 00:00:58 +0200 |
| commit | df842a8e8d6eab8bf752e3453402dcdd45e1c773 (patch) | |
| tree | 31d3c5282ec548981c4b8f205b1d4e0a1d7a4435 | |
| parent | 4dbaaa63bba054b9b4d538c059b3de5a57327d31 (diff) | |
| parent | 60919488f17ded7bcd1dd48429baaca530475161 (diff) | |
| download | volse-hubzilla-df842a8e8d6eab8bf752e3453402dcdd45e1c773.tar.gz volse-hubzilla-df842a8e8d6eab8bf752e3453402dcdd45e1c773.tar.bz2 volse-hubzilla-df842a8e8d6eab8bf752e3453402dcdd45e1c773.zip | |
Merge branch 'dev' into 'dev'
Better spoiler BBcode tag conversion to Markdown
See merge request hubzilla/core!1718
| -rw-r--r-- | include/markdown.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/markdown.php b/include/markdown.php index 0a8076799..213986867 100644 --- a/include/markdown.php +++ b/include/markdown.php @@ -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); |