more regex fun

darcs-hash:20080529182725-84dde-aa343a6ecd3c6ac79adcd96198d1f18b6c56cb79.gz
This commit is contained in:
Evan Prodromou 2008-05-29 14:27:25 -04:00
parent 02132baea5
commit 317496e979

View File

@ -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;