aboutsummaryrefslogtreecommitdiffstats
path: root/include/text.php
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2018-05-02 13:49:22 -0700
committerzotlabs <mike@macgirvin.com>2018-05-02 13:49:22 -0700
commit285781b8870d1c36cf90a3b38a448719b8bf9d21 (patch)
tree82fb23e0d82e798d11fabb9bbb0aef0d9e2b91b6 /include/text.php
parent7a55ead97db94284146612364b8ce1c59de8771f (diff)
downloadvolse-hubzilla-285781b8870d1c36cf90a3b38a448719b8bf9d21.tar.gz
volse-hubzilla-285781b8870d1c36cf90a3b38a448719b8bf9d21.tar.bz2
volse-hubzilla-285781b8870d1c36cf90a3b38a448719b8bf9d21.zip
hubzilla issue #1151 - activitypub mention gets bookmarked
Diffstat (limited to 'include/text.php')
-rw-r--r--include/text.php4
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);