summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorEvan Prodromou <evan@prodromou.name>2008-05-29 14:27:25 -0400
committerEvan Prodromou <evan@prodromou.name>2008-05-29 14:27:25 -0400
commit317496e9794d4d5454e8218f87e3c858483a65d1 (patch)
tree19702064a764297199fc36d6170942723b3c39e9 /lib
parent02132baea599389be59d1cce9772742f7f51c6ef (diff)
more regex fun
darcs-hash:20080529182725-84dde-aa343a6ecd3c6ac79adcd96198d1f18b6c56cb79.gz
Diffstat (limited to 'lib')
-rw-r--r--lib/util.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/util.php b/lib/util.php
index 08e5f69f6..40df79736 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.'<', '<a href="\\0" class="extlink">\\0</a>', $r);
+ $r = preg_replace('/(^|\b)@([\w-]+)($|\b)/e', "'\\1@'.common_at_link($id, '\\2').'\\3'", $r);
+ $r = preg_replace('(^|\b)(https?|ftp)://[-A-Z0-9+&@#/%?=~_|!:,.;]*[-A-Z0-9+&@#/%=~_|]', '<a href="\0" class="extlink">\0</a>', $r);
# XXX: # tags
# XXX: machine tags
return $r;