summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Prodromou <evan@prodromou.name>2008-06-20 16:34:49 -0400
committerEvan Prodromou <evan@prodromou.name>2008-06-20 16:34:49 -0400
commit6a6ad1f76effd973fdf0ffe6a7b308715c74f31b (patch)
tree9c05cbb6b717f05086656bff3649e752796c756d
parente547595e48364c6ca426c80f70af788707b1b91e (diff)
skip a DB hit, and better regex
darcs-hash:20080620203449-84dde-b878277e0ad5a5478b7396fbca7e42feb39715f8.gz
-rw-r--r--lib/util.php5
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/util.php b/lib/util.php
index 7f9b23724..42c9a1a0b 100644
--- 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,