diff options
| author | Max Kostikov <max@kostikov.co> | 2019-07-25 12:25:27 +0200 |
|---|---|---|
| committer | Max Kostikov <max@kostikov.co> | 2019-07-25 12:25:27 +0200 |
| commit | 5695350e98a8a2c802ff419c5b29b0f01f0180df (patch) | |
| tree | 66fe3d69f857c0e57233dbb848022c61c459b012 /include/text.php | |
| parent | 4e3a0720c3c1dc6906adb055769254d77c740ba3 (diff) | |
| download | volse-hubzilla-5695350e98a8a2c802ff419c5b29b0f01f0180df.tar.gz volse-hubzilla-5695350e98a8a2c802ff419c5b29b0f01f0180df.tar.bz2 volse-hubzilla-5695350e98a8a2c802ff419c5b29b0f01f0180df.zip | |
Revert "Merge branch 'dev' into 'dev'"
This reverts merge request !1694
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 1cde6bb01..8adcc1269 100644 --- a/include/text.php +++ b/include/text.php @@ -3405,10 +3405,10 @@ 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\:\/\-\?\&\;\.\=\@\_\~\#\%\$\!\\ -+\,\(\)]+)([\,\.\:\;]\s|$)/ismu", '\nakedoembed', $body); ++\,\(\)]+)/ismu", '\nakedoembed', $body); $body = preg_replace_callback("/([^\]\='".'"'."\/\{]|^|\#\^)(https?\:\/\/[a-zA-Z0-9\pL\:\/\-\?\&\;\.\=\@\_\~\#\%\$\!\\ -+\,\(\)]+)([\,\.\:\;]\s|$)/ismu", '\red_zrl_callback', $body); ++\,\(\)]+)/ismu", '\red_zrl_callback', $body); $body = preg_replace_callback('/\[\$b64zrl(.*?)\[\/(zrl)\]/ism','\red_unescape_codeblock',$body); |