diff options
| author | zotlabs <mike@macgirvin.com> | 2017-11-12 16:07:04 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-11-12 16:07:04 -0800 |
| commit | 59caf141d1e271ee4a6e7ab8b66f4070835dde95 (patch) | |
| tree | 44056bdac329f6356fa75ed3566c88568677d89f /include/markdown.php | |
| parent | 71a30cd9a5f5c749e3b76e961876afbd0afa87f9 (diff) | |
| parent | 6ea7ef43e0a0a99f81986c8e1fe5955800bfa496 (diff) | |
| download | volse-hubzilla-59caf141d1e271ee4a6e7ab8b66f4070835dde95.tar.gz volse-hubzilla-59caf141d1e271ee4a6e7ab8b66f4070835dde95.tar.bz2 volse-hubzilla-59caf141d1e271ee4a6e7ab8b66f4070835dde95.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
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 |