summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorEvan Prodromou <evan@prodromou.name>2008-05-29 13:36:35 -0400
committerEvan Prodromou <evan@prodromou.name>2008-05-29 13:36:35 -0400
commitf4b8feec0a3fb81d546bea05a51f771dbeb30f39 (patch)
tree40661e02caaaf471dafbacaae15239f8fbad5a88 /lib
parent1389e3b4dc7437b11fb3b0f22902b4dc946f2fc3 (diff)
keep the ampersand in atlinks
darcs-hash:20080529173635-84dde-8152ddcd07e094f5478a470f5b1a3ea28ce5421e.gz
Diffstat (limited to 'lib')
-rw-r--r--lib/util.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/util.php b/lib/util.php
index eac9ed9cc..0fa3178c8 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('/(^|\s)@([\w-]+)($|\s)/e', "'\\1'.@common_at_link($id, '\\2').'\\3'", $r);
+ $r = preg_replace('/(^|\s)@([\w-]+)($|\s)/e', "'\\1@'.common_at_link($id, '\\2').'\\3'", $r);
# XXX: # tags
# XXX: machine tags
return $r;