diff options
| author | Mario Vavti <mario@mariovavti.com> | 2018-05-03 09:44:53 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2018-05-03 09:44:53 +0200 |
| commit | cd526139fb0440938971261c0502006e9d212fbf (patch) | |
| tree | 9cc3e0ed340283fe168bb904c911248a2f7fd661 /include/text.php | |
| parent | d83f12e883e79b7268677f8981579102c48ca00b (diff) | |
| parent | 459ec78a5e3cb09ee908fd7810bbb0b80b2e4713 (diff) | |
| download | volse-hubzilla-cd526139fb0440938971261c0502006e9d212fbf.tar.gz volse-hubzilla-cd526139fb0440938971261c0502006e9d212fbf.tar.bz2 volse-hubzilla-cd526139fb0440938971261c0502006e9d212fbf.zip | |
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'include/text.php')
| -rw-r--r-- | include/text.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/text.php b/include/text.php index 24f8e1623..dc3a155de 100644 --- a/include/text.php +++ b/include/text.php @@ -3313,9 +3313,9 @@ function cleanup_bbcode($body) { $body = preg_replace_callback('/\[zrl(.*?)\[\/(zrl)\]/ism','\red_escape_codeblock',$body); - $body = preg_replace_callback("/([^\]\='".'"'."\/]|^|\#\^)(https?\:\/\/[a-zA-Z0-9\pL\:\/\-\?\&\;\.\=\@\_\~\#\%\$\!\\ + $body = preg_replace_callback("/([^\]\='".'"'."\/\{]|^|\#\^)(https?\:\/\/[a-zA-Z0-9\pL\:\/\-\?\&\;\.\=\@\_\~\#\%\$\!\\ +\,\(\)]+)/ismu", '\nakedoembed', $body); - $body = preg_replace_callback("/([^\]\='".'"'."\/]|^|\#\^)(https?\:\/\/[a-zA-Z0-9\pL\:\/\-\?\&\;\.\=\@\_\~\#\%\$\!\\ + $body = preg_replace_callback("/([^\]\='".'"'."\/\{]|^|\#\^)(https?\:\/\/[a-zA-Z0-9\pL\:\/\-\?\&\;\.\=\@\_\~\#\%\$\!\\ +\,\(\)]+)/ismu", '\red_zrl_callback', $body); $body = preg_replace_callback('/\[\$b64zrl(.*?)\[\/(zrl)\]/ism','\red_unescape_codeblock',$body); |