skip a DB hit, and better regex

darcs-hash:20080620203449-84dde-b878277e0ad5a5478b7396fbca7e42feb39715f8.gz

diff --git a/lib/util.php b/lib/util.php
index 7f9b237249dddd0ec4dcbc3ff37996859eaaee75..42c9a1a0bc7521e03e33919738601b2dd6132adc 100644 (file)
--- a/lib/util.php
+++ b/lib/util.php
@@ -445,7 +445,7 @@ function common_render_content($text, $notice) {
        $r = htmlspecialchars($text);
        $id = $notice->profile_id;
        $r = preg_replace('@https?://\S+@', '<a href="\0" class="extlink">\0</a>', $r);
-       $r = preg_replace('/(^|\s+)@([\w-]+)/e', "'\\1@'.common_at_link($id, '\\2')", $r);
+       $r = preg_replace('/(^|\s+)@([a-z0-9]{1,64})/e', "'\\1@'.common_at_link($id, '\\2')", $r);
        # XXX: # tags
        # XXX: machine tags
        return $r;
@@ -473,8 +473,7 @@ function common_at_link($sender_id, $nickname) {
        if ($sender) {
                $recipient_user = User::staticGet('nickname', $nickname);
                if ($recipient_user) {
-                       $recipient = $recipient->getProfile();
-                       return '<a href="'.htmlspecialchars($recipient->profileurl).'" class="atlink usertouser">'.$nickname.'</a>';
+                       return '<a href="'.htmlspecialchars(common_profile_url($nickname)).'" class="atlink usertouser">'.$nickname.'</a>';
                }
        }
        # Otherwise, no links. @messages from local users to remote users,