diff options
| author | Mario Vavti <mario@mariovavti.com> | 2018-08-15 13:21:12 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2018-08-15 13:21:12 +0200 |
| commit | 2becc3273aa377574d566c052036f425105b2389 (patch) | |
| tree | ff7a897190ea8f63b2aa67923ffb58fcd128d531 /include/markdown.php | |
| parent | 10c5b46e3bb4cfa76cbe7158f5eba54809cd0d79 (diff) | |
| parent | f4f610f1a3b3826f960e3db2026bf2204e939fe8 (diff) | |
| download | volse-hubzilla-2becc3273aa377574d566c052036f425105b2389.tar.gz volse-hubzilla-2becc3273aa377574d566c052036f425105b2389.tar.bz2 volse-hubzilla-2becc3273aa377574d566c052036f425105b2389.zip | |
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'include/markdown.php')
| -rw-r--r-- | include/markdown.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/markdown.php b/include/markdown.php index 1b3538306..f4944e2cc 100644 --- a/include/markdown.php +++ b/include/markdown.php @@ -82,10 +82,10 @@ function markdown_to_bb($s, $use_zrl = false, $options = []) { $s = preg_replace_callback("/\[img\](.*?)\[\/img\]/ism", 'use_zrl_cb_img', $s); $s = preg_replace_callback("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", 'use_zrl_cb_img_x', $s); } - $s = preg_replace_callback("/([^\]\=\{]|^)(https?\:\/\/)([a-zA-Z0-9\pL\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,\@\(\)]+)/ismu", 'use_zrl_cb_link',$s); + $s = preg_replace_callback("/([^\]\=\{\/]|^)(https?\:\/\/)([a-zA-Z0-9\pL\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,\@\(\)]+)/ismu", 'use_zrl_cb_link',$s); } else { - $s = preg_replace("/([^\]\=\{]|^)(https?\:\/\/)([a-zA-Z0-9\pL\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,\@\(\)]+)/ismu", '$1[url=$2$3]$2$3[/url]',$s); + $s = preg_replace("/([^\]\=\{\/]|^)(https?\:\/\/)([a-zA-Z0-9\pL\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,\@\(\)]+)/ismu", '$1[url=$2$3]$2$3[/url]',$s); } // remove duplicate adjacent code tags |