summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorEvan Prodromou <evan@prodromou.name>2008-05-29 13:25:49 -0400
committerEvan Prodromou <evan@prodromou.name>2008-05-29 13:25:49 -0400
commitfb437aabcaf9f6300c77079c93eba3f5a7f49f2f (patch)
tree95bd19e55dcf094f7ad9e0a9ce1d679cada4d49f /lib
parenta8fa9eb1bd1318c2612e54cdcd6e80cadac5dd65 (diff)
don't check for notice in rendering content; just render it!
darcs-hash:20080529172549-84dde-12c79e34baa6a19938350447f5939fb25febea21.gz
Diffstat (limited to 'lib')
-rw-r--r--lib/util.php8
1 files changed, 3 insertions, 5 deletions
diff --git a/lib/util.php b/lib/util.php
index 7a0d5d11f..54a30a914 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -349,12 +349,10 @@ function common_canonical_email($email) {
return $email;
}
-function common_render_content($text, $notice=NULL) {
+function common_render_content($text, $notice) {
$r = htmlspecialchars($text);
- if ($notice) {
- $id = $notice->profile_id;
- $r = preg_replace('/\b@([\w-]+)\b/e', "ATLINK*** \\1 ***", $r);
- }
+ $id = $notice->profile_id;
+ $r = preg_replace('/\b@([\w-]+)\b/e', "@common_at_link($id,'\\1')", $r);
# XXX: # tags
# XXX: machine tags
return $r;