Revert "Merge branch 'dev' into 'dev'"

This reverts merge request !1694
This commit is contained in:
Max Kostikov
2019-07-25 12:25:27 +02:00
parent 4e3a0720c3
commit 5695350e98
4 changed files with 6 additions and 6 deletions

View File

@@ -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);