aboutsummaryrefslogtreecommitdiffstats
path: root/include/text.php
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2018-05-03 12:34:51 +0200
committerMario Vavti <mario@mariovavti.com>2018-05-03 12:34:51 +0200
commit2f9a04455988620485fb0462c1889af502a20f71 (patch)
tree00651d5e1c51b1d18c68c20288f91df49b252f56 /include/text.php
parent1f429a003386bbf11f26c9caea4b18b01cf09ef2 (diff)
downloadvolse-hubzilla-2f9a04455988620485fb0462c1889af502a20f71.tar.gz
volse-hubzilla-2f9a04455988620485fb0462c1889af502a20f71.tar.bz2
volse-hubzilla-2f9a04455988620485fb0462c1889af502a20f71.zip
Revert "hubzilla issue #1151 - activitypub mention gets bookmarked"
This reverts commit 285781b8870d1c36cf90a3b38a448719b8bf9d21.
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 babc18b44..af88c9f9c 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);