aboutsummaryrefslogtreecommitdiffstats
path: root/include/text.php
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2018-05-02 13:49:22 -0700
committerMario Vavti <mario@mariovavti.com>2018-05-03 12:34:35 +0200
commit1f429a003386bbf11f26c9caea4b18b01cf09ef2 (patch)
tree730e49425a0e2baf8163c79657868a53287d61e1 /include/text.php
parenta3ed0b94cd5d43c70a835a6ed7226f5645f1c121 (diff)
downloadvolse-hubzilla-1f429a003386bbf11f26c9caea4b18b01cf09ef2.tar.gz
volse-hubzilla-1f429a003386bbf11f26c9caea4b18b01cf09ef2.tar.bz2
volse-hubzilla-1f429a003386bbf11f26c9caea4b18b01cf09ef2.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 af88c9f9c..babc18b44 100644
--- a/include/text.php
+++ b/include/text.php
@@ -3273,9 +3273,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);