diff options
| author | Evan Prodromou <evan@prodromou.name> | 2008-05-29 15:07:43 -0400 |
|---|---|---|
| committer | Evan Prodromou <evan@prodromou.name> | 2008-05-29 15:07:43 -0400 |
| commit | a63208b3dab1a2d1c9b924dabb86be2edc90ebed (patch) | |
| tree | 53ec5eb25b98ef85eaf65f937a744599b4855555 /lib | |
| parent | 45efc7b61bf5b960900ed69e768093f1238a060c (diff) | |
move linkifying so URL links come first
darcs-hash:20080529190743-84dde-849369c3c48006aaf6fcc523c9a952ea5d5bd999.gz
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/util.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/util.php b/lib/util.php index 8b977400a..30bd4d3ae 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('/(^|\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('/(^|\b)@([\w-]+)($|\b)/e', "'\\1@'.common_at_link($id, '\\2').'\\3'", $r); # XXX: # tags # XXX: machine tags return $r; |