X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Futil.php;h=30bd4d3aec96dd11ef8f8282b223c0a56cacf71d;hb=a63208b3dab1a2d1c9b924dabb86be2edc90ebed;hp=08e5f69f6573f70901a57855698456631a785c5b;hpb=02132baea599389be59d1cce9772742f7f51c6ef;p=quix0rs-gnu-social.git diff --git a/lib/util.php b/lib/util.php index 08e5f69f65..30bd4d3aec 100644 --- a/lib/util.php +++ b/lib/util.php @@ -354,8 +354,8 @@ define('URL_REGEX', '^|[ \t\r\n])((ftp|http|https|gopher|mailto|news|nntp|telnet function common_render_content($text, $notice) { $r = htmlspecialchars($text); $id = $notice->profile_id; - $r = preg_replace('/(^|\s)@([\w-]+)($|\s)/e', "'\\1@'.common_at_link($id, '\\2').'\\3'", $r); -# $r = preg_replace('<'.URL_REGEX.'<', '\\0', $r); + $r = preg_replace('@https?://\S+@', '\0', $r); + $r = preg_replace('/(^|\b)@([\w-]+)($|\b)/e', "'\\1@'.common_at_link($id, '\\2').'\\3'", $r); # XXX: # tags # XXX: machine tags return $r;