move linkifying so URL links come first
darcs-hash:20080529190743-84dde-849369c3c48006aaf6fcc523c9a952ea5d5bd999.gz
This commit is contained in:
parent
45efc7b61b
commit
a63208b3da
|
@ -354,8 +354,8 @@ define('URL_REGEX', '^|[ \t\r\n])((ftp|http|https|gopher|mailto|news|nntp|telnet
|
||||||
function common_render_content($text, $notice) {
|
function common_render_content($text, $notice) {
|
||||||
$r = htmlspecialchars($text);
|
$r = htmlspecialchars($text);
|
||||||
$id = $notice->profile_id;
|
$id = $notice->profile_id;
|
||||||
$r = preg_replace('/(^|\b)@([\w-]+)($|\b)/e', "'\\1@'.common_at_link($id, '\\2').'\\3'", $r);
|
|
||||||
$r = preg_replace('@https?://\S+@', '<a href="\0" class="extlink">\0</a>', $r);
|
$r = preg_replace('@https?://\S+@', '<a href="\0" class="extlink">\0</a>', $r);
|
||||||
|
$r = preg_replace('/(^|\b)@([\w-]+)($|\b)/e', "'\\1@'.common_at_link($id, '\\2').'\\3'", $r);
|
||||||
# XXX: # tags
|
# XXX: # tags
|
||||||
# XXX: machine tags
|
# XXX: machine tags
|
||||||
return $r;
|
return $r;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user