summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Prodromou <evan@prodromou.name>2008-05-29 13:32:34 -0400
committerEvan Prodromou <evan@prodromou.name>2008-05-29 13:32:34 -0400
commit85aeafe34a33ebc6d0e54560b52749caf44195f2 (patch)
tree2676954805bc4372ec00a1f3cc5faefe88b10c2a
parentfb437aabcaf9f6300c77079c93eba3f5a7f49f2f (diff)
better regular expression for atlinks
darcs-hash:20080529173234-84dde-7b1e8fa0af993edd74b11f88bdfbc24e970298a7.gz
-rw-r--r--lib/util.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/util.php b/lib/util.php
index 54a30a914..5ed632b7b 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -352,7 +352,7 @@ function common_canonical_email($email) {
function common_render_content($text, $notice) {
$r = htmlspecialchars($text);
$id = $notice->profile_id;
- $r = preg_replace('/\b@([\w-]+)\b/e', "@common_at_link($id,'\\1')", $r);
+ $r = preg_replace('/(^|\s)@([\w-]+)($|\s)/e', "'\\1'.@common_at_link($id, '\\2').'\\3'", $r);
# XXX: # tags
# XXX: machine tags
return $r;