aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2019-05-24 10:27:45 +0200
committerMario Vavti <mario@mariovavti.com>2019-05-24 10:27:45 +0200
commit528b9b6a60d847b0ecb639cb7fb8e01ee79b11d4 (patch)
treecf512df3915dcdc1cf2365206ef998097adc6119
parent9ea483d1dc01fa9439e6f261d04f1b97fb1302a3 (diff)
downloadvolse-hubzilla-528b9b6a60d847b0ecb639cb7fb8e01ee79b11d4.tar.gz
volse-hubzilla-528b9b6a60d847b0ecb639cb7fb8e01ee79b11d4.tar.bz2
volse-hubzilla-528b9b6a60d847b0ecb639cb7fb8e01ee79b11d4.zip
fix #1374
-rw-r--r--include/markdown.php4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/markdown.php b/include/markdown.php
index 2513a7d77..7d1f16958 100644
--- a/include/markdown.php
+++ b/include/markdown.php
@@ -76,6 +76,8 @@ function markdown_to_bb($s, $use_zrl = false, $options = []) {
$s = html2bbcode($s);
+ $s = bb_code_protect($s);
+
// Convert everything that looks like a link to a link
if($use_zrl) {
if (strpos($s,'[/img]') !== false) {
@@ -88,6 +90,8 @@ function markdown_to_bb($s, $use_zrl = false, $options = []) {
$s = preg_replace("/([^\]\=\{\/]|^)(https?\:\/\/)([a-zA-Z0-9\pL\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,\@\(\)]+)/ismu", '$1[url=$2$3]$2$3[/url]',$s);
}
+ $s = bb_code_unprotect($s);
+
// remove duplicate adjacent code tags
$s = preg_replace("/(\[code\])+(.*?)(\[\/code\])+/ism","[code]$2[/code]", $s);