diff options
| author | Mario Vavti <mario@mariovavti.com> | 2017-11-11 21:35:56 +0100 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2017-11-11 21:35:56 +0100 |
| commit | bd3bc503edc9fd5035ed54070b0adf8760e402fa (patch) | |
| tree | 0a4cbac294969ebc374e633488598beff8fde752 /include/markdown.php | |
| parent | 823729d2c1ea202a463c645d3a84ebf35140bd9f (diff) | |
| parent | 34b38f06e00d929c3004ca7ee961405de0a209e1 (diff) | |
| download | volse-hubzilla-bd3bc503edc9fd5035ed54070b0adf8760e402fa.tar.gz volse-hubzilla-bd3bc503edc9fd5035ed54070b0adf8760e402fa.tar.bz2 volse-hubzilla-bd3bc503edc9fd5035ed54070b0adf8760e402fa.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 865727b20..f398d279e 100644 --- a/include/markdown.php +++ b/include/markdown.php @@ -75,10 +75,10 @@ function markdown_to_bb($s, $use_zrl = false, $options = []) { // Convert everything that looks like a link to a link if($use_zrl) { $s = str_replace(['[img', '/img]'], ['[zmg', '/zmg]'], $s); - $s = preg_replace("/([^\]\=]|^)(https?\:\/\/)([a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,\@\(\)]+)/ism", '$1[zrl=$2$3]$2$3[/zrl]',$s); + $s = preg_replace("/([^\]\=]|^)(https?\:\/\/)([a-zA-Z0-9\pL\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,\@\(\)]+)/ismu", '$1[zrl=$2$3]$2$3[/zrl]',$s); } else { - $s = preg_replace("/([^\]\=]|^)(https?\:\/\/)([a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,\@\(\)]+)/ism", '$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 |