summaryrefslogtreecommitdiff
path: root/lib/util.php
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2009-10-19 18:12:00 -0400
committerEvan Prodromou <evan@status.net>2009-10-19 18:12:00 -0400
commitfc61b7162576deb11a7947a8a04293b744f9d5fc (patch)
treefe982d15fab61bc974b92bc8162ed9d9da041976 /lib/util.php
parent035d4cf86e8cd2bec46a9b24e098c798f3ec3cb3 (diff)
parentd72748eb8e71f81e7cddca610ec98a8910dd347f (diff)
merge from testing
Diffstat (limited to 'lib/util.php')
-rw-r--r--lib/util.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/util.php b/lib/util.php
index e9ae2bd50..e641afd4d 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -401,7 +401,7 @@ function common_render_content($text, $notice)
{
$r = common_render_text($text);
$id = $notice->profile_id;
- $r = preg_replace('/(^|[\s\.\,\:\;]+)@([A-Za-z0-9]{1,64})/e', "'\\1@'.common_at_link($id, '\\2')", $r);
+ $r = preg_replace('/(^|\s+)@(['.NICKNAME_FMT.']{1,64})/e', "'\\1@'.common_at_link($id, '\\2')", $r);
$r = preg_replace('/^T ([A-Z0-9]{1,64}) /e', "'T '.common_at_link($id, '\\1').' '", $r);
$r = preg_replace('/(^|[\s\.\,\:\;]+)@#([A-Za-z0-9]{1,64})/e', "'\\1@#'.common_at_hash_link($id, '\\2')", $r);
$r = preg_replace('/(^|[\s\.\,\:\;]+)!([A-Za-z0-9]{1,64})/e', "'\\1!'.common_group_link($id, '\\2')", $r);