diff options
| author | Mario Vavti <mario@mariovavti.com> | 2019-06-04 10:19:04 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2019-06-04 10:19:04 +0200 |
| commit | e4ca3609d90bb437061e4b8db95ed0424b25eb76 (patch) | |
| tree | aa070e40ab01cb1354cbf879a0fb8b2f570631d5 /include/markdown.php | |
| parent | 071fba2f7121aeb9690a21398935a53deac09af8 (diff) | |
| parent | bc092d8d7815195d62299c0ea54caa4759e6f2e7 (diff) | |
| download | volse-hubzilla-4.2.tar.gz volse-hubzilla-4.2.tar.bz2 volse-hubzilla-4.2.zip | |
Merge branch '4.2RC'4.2
Diffstat (limited to 'include/markdown.php')
| -rw-r--r-- | include/markdown.php | 4 |
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); |