move linkifying so URL links come first

darcs-hash:20080529190743-84dde-849369c3c48006aaf6fcc523c9a952ea5d5bd999.gz

diff --git a/lib/util.php b/lib/util.php
index 8b977400a777d5fb28f4e0fec035011633052145..30bd4d3aec96dd11ef8f8282b223c0a56cacf71d 100644 (file)
--- 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;